You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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 ...		13 years ago
..
Kconfig	NFSD: Added fault injection	13 years ago
Makefile	NFSD: Added fault injection	13 years ago
acl.h	nfsd4: remove outdated pathname-comments	14 years ago
auth.c	Merge branch 'for-3.5' of git://linux-nfs.org/~bfields/linux	13 years ago
auth.h	…
cache.h	nfsd: turn on reply cache for NFSv4	14 years ago
current_stateid.h	nfsd41: use current stateid by value	13 years ago
export.c	SUNRPC: service request network namespace helper introduced	13 years ago
fault_inject.c	nfsd: return 0 on reads of fault injection files	13 years ago
fault_inject.h	NFSD: Added fault injection	13 years ago
idmap.h	nfsd: pass network context to idmap init/exit functions	13 years ago
lockd.c	nfsd: Remove deprecated nfsctl system call and related code.	14 years ago
netns.h	NFSd: make boot_time variable per network namespace	13 years ago
nfs2acl.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
nfs3acl.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
nfs3proc.c	nfsd41: make sure nfs server process OPEN with EXCLUSIVE4_1 correctly	14 years ago
nfs3xdr.c	nfsd: fix compose_entry_fh() failure exits	13 years ago
nfs4acl.c	fs: add export.h to files using EXPORT_SYMBOL/THIS_MODULE macros	13 years ago
nfs4callback.c	nfsd4: remove unnecessary comment	13 years ago
nfs4idmap.c	SUNRPC: service request network namespace helper introduced	13 years ago
nfs4proc.c	LockD: pass actual network namespace to grace period management functions	13 years ago
nfs4recover.c	nfsd: Push mnt_want_write() outside of i_mutex	13 years ago
nfs4state.c	NFSd: make boot_time variable per network namespace	13 years ago
nfs4xdr.c	nfsd4: our filesystems are normally case sensitive	13 years ago
nfscache.c	nfsd: turn on reply cache for NFSv4	14 years ago
nfsctl.c	NFSd: introduce nfsd_destroy() helper	13 years ago
nfsd.h	NFSd: set nfsd_serv to NULL after service destruction	13 years ago
nfsfh.c	nfsd: Push mnt_want_write() outside of i_mutex	13 years ago
nfsfh.h	fs: propagate umode_t, misc bits	13 years ago
nfsproc.c	nfsd: Push mnt_want_write() outside of i_mutex	13 years ago
nfssvc.c	NFSd: set nfsd_serv to NULL after service destruction	13 years ago
nfsxdr.c	Fix common misspellings	14 years ago
state.h	NFSd: make boot_time variable per network namespace	13 years ago
stats.c	SUNRPC: register service stats /proc entries in passed network namespace context	13 years ago
vfs.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	13 years ago
vfs.h	nfsd: Push mnt_want_write() outside of i_mutex	13 years ago
xdr.h	nfsd: remove pointless paths in file headers	15 years ago
xdr3.h	nfsd: remove pointless paths in file headers	15 years ago
xdr4.h	nfsd4: int/__be32 fixes	13 years ago