Linus Torvalds
a0e881b7c1
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs ...
Pull second vfs pile from Al Viro:
"The stuff in there: fsfreeze deadlock fixes by Jan (essentially, the
deadlock reproduced by xfstests 068), symlink and hardlink restriction
patches, plus assorted cleanups and fixes.
Note that another fsfreeze deadlock (emergency thaw one) is *not*
dealt with - the series by Fernando conflicts a lot with Jan's, breaks
userland ABI (FIFREEZE semantics gets changed) and trades the deadlock
for massive vfsmount leak; this is going to be handled next cycle.
There probably will be another pull request, but that stuff won't be
in it."
Fix up trivial conflicts due to unrelated changes next to each other in
drivers/{staging/gdm72xx/usb_boot.c, usb/gadget/storage_common.c}
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (54 commits)
delousing target_core_file a bit
Documentation: Correct s_umount state for freeze_fs/unfreeze_fs
fs: Remove old freezing mechanism
ext2: Implement freezing
btrfs: Convert to new freezing mechanism
nilfs2: Convert to new freezing mechanism
ntfs: Convert to new freezing mechanism
fuse: Convert to new freezing mechanism
gfs2: Convert to new freezing mechanism
ocfs2: Convert to new freezing mechanism
xfs: Convert to new freezing code
ext4: Convert to new freezing mechanism
fs: Protect write paths by sb_start_write - sb_end_write
fs: Skip atime update on frozen filesystem
fs: Add freezing handling to mnt_want_write() / mnt_drop_write()
fs: Improve filesystem freezing handling
switch the protection of percpu_counter list to spinlock
nfsd: Push mnt_want_write() outside of i_mutex
btrfs: Push mnt_want_write() outside of i_mutex
fat: Push mnt_want_write() outside of i_mutex
...
2012-08-01 10:26:23 -07:00
sock: Introduce named constants for sk_reuse
2012-04-21 15:52:25 -04:00
ocfs2: trivial endianness misannotations
2012-05-29 23:28:34 -04:00
don't pass nameidata to ->create()
2012-07-14 16:34:47 +04:00
switch posix_acl_equiv_mode() to umode_t *
2011-08-01 02:10:06 -04:00
fs: take the ACL checks to common code
2011-07-25 14:30:23 -04:00
ocfs2: ->l_next_free_req breakage on big-endian
2012-04-13 12:31:37 -04:00
ocfs2: Add ocfs2_trim_fs for SSD trim support.
2011-05-23 23:37:18 -07:00
ocfs2: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:25 +08:00
ocfs2: serialize unaligned aio
2011-07-28 02:07:16 -07:00
ocfs2: kill endianness abuses in blockcheck.c
2012-05-29 23:28:35 -04:00
ocfs2: Remove masklog ML_UPTODATE.
2011-02-24 16:22:20 +08:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
2011-12-01 14:55:34 -08:00
ocfs2: use spinlock irqsave for downconvert lock.patch
2012-07-03 23:27:15 -07:00
->encode_fh() API change
2012-05-29 23:28:33 -04:00
ocfs2: for SEEK_DATA/SEEK_HOLE, return internal error unchanged if ocfs2_get_clusters_nocache() or ocfs2_inode_lock() call failed.
2012-07-03 23:27:16 -07:00
ocfs2: Implement llseek()
2011-07-25 14:58:15 -07:00
ocfs2: Convert to new freezing mechanism
2012-07-31 09:45:49 +04:00
->permission() sanitizing: don't pass flags to ->permission()
2011-07-20 01:43:24 -04:00
ocfs2: Remove mlog(0) from fs/ocfs2/heartbeat.c
2011-02-23 21:17:39 +08:00
ocfs: simplify symlink handling
2012-05-29 23:28:40 -04:00
ocfs2: serialize unaligned aio
2011-07-28 02:07:16 -07:00
ocfs2: Convert to new freezing mechanism
2012-07-31 09:45:49 +04:00
ocfs2: Convert to new freezing mechanism
2012-07-31 09:45:49 +04:00
ocfs2: Add a missing journal credit in ocfs2_link_credits() -v2
2011-11-17 01:46:48 -08:00
ocfs2: Make OCFS2_FS depend on CONFIGFS_FS
2011-01-16 21:22:40 +00:00
ocfs2: use memweight()
2012-07-30 17:25:16 -07:00
ocfs2: remove INODE from unused files.
2011-02-21 11:18:23 +08:00
Ocfs2/move_extents: Add basic framework and source files for extent moving.
2011-05-25 15:17:08 +08:00
ocfs2: Convert to new freezing mechanism
2012-07-31 09:45:49 +04:00
ocfs2: deal with __user misannotations
2012-05-29 23:28:35 -04:00
Ocfs2/move_extents: move/defrag extents within a certain range.
2011-05-25 15:17:12 +08:00
don't pass nameidata to ->create()
2012-07-14 16:34:47 +04:00
ocfs2: avoid unaligned access to dqc_bitmap
2011-12-01 14:39:32 -08:00
Revert wrong fixes for common misspellings
2011-04-26 23:31:11 -07:00
Ocfs2/move_extents: Adding new ioctl code 'OCFS2_IOC_MOVE_EXT' to ocfs2.
2011-05-25 15:17:08 +08:00
ocfs2: Add trace event for trim.
2011-05-23 23:37:20 -07:00
ocfs2: use system_wq instead of ocfs2_quota_wq
2011-02-01 11:42:42 +01:00
ocfs2: Fix bogus error message from ocfs2_global_read_info
2012-07-03 23:27:17 -07:00
ocfs2: avoid unaligned access to dqc_bitmap
2011-12-01 14:39:32 -08:00
pull mnt_want_write()/mnt_drop_write() into kern_path_create()/done_path_create() resp.
2012-07-29 21:24:15 +04:00
Ocfs2/refcounttree: Publicize couple of funcs from refcounttree.c
2011-05-25 15:17:08 +08:00
ocfs2: Remove masklog ML_RESERVATIONS.
2011-02-23 22:10:56 +08:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
ocfs2: Remove mlog(0) from fs/ocfs2/suballoc.c
2011-02-22 08:24:01 +08:00
ocfs2: Clean up messages in the fs
2011-07-24 10:34:54 -07:00
ocfs2/cluster: Cluster up now includes network connections too
2011-07-24 10:33:54 -07:00
dlm: add recovery callbacks
2012-01-04 08:56:31 -06:00
Fix common misspellings
2011-03-31 11:26:23 -03:00
ocfs2: ->e_leaf_clusters endianness breakage
2012-04-13 12:31:43 -04:00
ocfs2: fix leaks on failure exits in module_init
2012-03-20 21:29:49 -04:00
treewide: use __printf not __attribute__((format(printf,...)))
2011-10-31 17:30:54 -07:00
ocfs: simplify symlink handling
2012-05-29 23:28:40 -04:00
ocfs: simplify symlink handling
2012-05-29 23:28:40 -04:00
ocfs2: Remove mlog(0) from fs/ocfs2/file.c
2011-02-22 22:14:41 +08:00
ocfs2: Remove masklog ML_UPTODATE.
2011-02-24 16:22:20 +08:00
ocfs2: propagate umode_t
2012-01-03 22:55:02 -05:00
ocfs2: propagate umode_t
2012-01-03 22:55:02 -05:00
a0e881b7c1