Linus Torvalds
9bf12df31f
Merge git://git.kvack.org/~bcrl/aio-next ...
Pull aio changes from Ben LaHaise:
"First off, sorry for this pull request being late in the merge window.
Al had raised a couple of concerns about 2 items in the series below.
I addressed the first issue (the race introduced by Gu's use of
mm_populate()), but he has not provided any further details on how he
wants to rework the anon_inode.c changes (which were sent out months
ago but have yet to be commented on).
The bulk of the changes have been sitting in the -next tree for a few
months, with all the issues raised being addressed"
* git://git.kvack.org/~bcrl/aio-next: (22 commits)
aio: rcu_read_lock protection for new rcu_dereference calls
aio: fix race in ring buffer page lookup introduced by page migration support
aio: fix rcu sparse warnings introduced by ioctx table lookup patch
aio: remove unnecessary debugging from aio_free_ring()
aio: table lookup: verify ctx pointer
staging/lustre: kiocb->ki_left is removed
aio: fix error handling and rcu usage in "convert the ioctx list to table lookup v3"
aio: be defensive to ensure request batching is non-zero instead of BUG_ON()
aio: convert the ioctx list to table lookup v3
aio: double aio_max_nr in calculations
aio: Kill ki_dtor
aio: Kill ki_users
aio: Kill unneeded kiocb members
aio: Kill aio_rw_vect_retry()
aio: Don't use ctx->tail unnecessarily
aio: io_cancel() no longer returns the io_event
aio: percpu ioctx refcount
aio: percpu reqs_available
aio: reqs_active -> reqs_available
aio: fix build when migration is disabled
...
2013-09-13 10:55:58 -07:00
ocfs2: fix a tiny race case when firing callbacks
2013-09-11 15:56:51 -07:00
ocfs2/dlm: force clean refmap when doing local cleanup
2013-09-11 15:56:49 -07:00
ocfs2: remove unused variable ip in dlmfs_get_root_inode()
2013-09-11 15:56:52 -07:00
ocfs2: clean up dead code in ocfs2_acl_from_xattr()
2013-09-11 15:56:39 -07:00
fs: take the ACL checks to common code
2011-07-25 14:30:23 -04:00
ocfs2: fix mutex_unlock and possible memory leak in ocfs2_remove_btree_range
2013-07-03 16:07:23 -07:00
ocfs2: use i_size_read() to access i_size
2013-09-11 15:56:30 -07:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
ocfs2: kill endianness abuses in blockcheck.c
2012-05-29 23:28:35 -04:00
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
ocfs2: fix null pointer dereference in ocfs2_dir_foreach_blk_id()
2013-08-13 17:57:49 -07:00
[readdir] convert ocfs2
2013-06-29 12:57:02 +04:00
aio: remove retry-based AIO
2013-05-07 18:38:27 -07:00
fs: encode_fh: return FILEID_INVALID if invalid fid_type
2013-02-26 02:46:10 -05:00
ocfs2: fix the end cluster offset of FIEMAP
2013-09-11 15:56:53 -07:00
ocfs2: Implement llseek()
2011-07-25 14:58:15 -07:00
Merge git://git.kvack.org/~bcrl/aio-next
2013-09-13 10:55:58 -07:00
->permission() sanitizing: don't pass flags to ->permission()
2011-07-20 01:43:24 -04:00
ocfs2: Convert uid and gids between in core and on disk inodes
2013-02-13 06:00:58 -08:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
ocfs2: use i_size_read() to access i_size
2013-09-11 15:56:30 -07:00
ocfs2: use i_size_read() to access i_size
2013-09-11 15:56:30 -07:00
ocfs2: lighten up allocate transaction
2013-09-11 15:56:28 -07:00
ocfs2: ac_bits_wanted should be local_alloc_bits when returns -ENOSPC
2013-09-11 15:56:31 -07:00
Ocfs2/move_extents: Add basic framework and source files for extent moving.
2011-05-25 15:17:08 +08:00
kill f_vfsmnt
2013-02-26 02:46:10 -05:00
ocfs2: fix a memory leak in __ocfs2_move_extents()
2013-09-11 15:56:44 -07:00
Ocfs2/move_extents: move/defrag extents within a certain range.
2011-05-25 15:17:12 +08:00
ocfs2: fix readonly issue in ocfs2_unlink()
2013-07-03 16:07:24 -07:00
ocfs2: remove unecessary variable needs_checkpoint
2013-07-03 16:07:23 -07:00
Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.
2011-05-25 15:17:08 +08:00
ocfs2: lighten up allocate transaction
2013-09-11 15:56:28 -07:00
ocfs2: use i_size_read() to access i_size
2013-09-11 15:56:30 -07:00
ocfs2: use i_size_read() to access i_size
2013-09-11 15:56:30 -07:00
ocfs2: add missing return value check of ocfs2_get_clusters()
2013-09-11 15:56:44 -07:00
ocfs2: fix NULL pointer dereference in ocfs2_duplicate_clusters_by_page
2013-08-13 17:57:49 -07:00
ocfs2: Clean up messages in the fs
2011-07-24 10:34:54 -07:00
ocfs2: remove kfree() redundant null checks
2013-02-21 17:22:19 -08:00
dlm: add recovery callbacks
2012-01-04 08:56:31 -06:00
ocfs2: remove duplicated mlog_errno() in ocfs2_relink_block_group
2013-07-03 16:07:24 -07:00
ocfs2: ac->ac_allow_chain_relink=0 won't disable group relink
2013-02-27 19:10:09 -08:00
fs/ocfs2/super.c: Use bigger nodestr to accomodate 32-bit node numbers
2013-08-28 19:26:38 -07:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
2013-02-26 02:46:12 -05:00
ocfs: simplify symlink handling
2012-05-29 23:28:40 -04:00
ocfs2: remove kfree() redundant null checks
2013-02-21 17:22:19 -08:00
ocfs2: fix possible double free in ocfs2_reflink_xattr_rec
2013-09-11 15:56:49 -07:00
xattr: Constify ->name member of "struct xattr".
2013-07-25 19:30:03 +10:00
9bf12df31f