linux/fs/nfsd
Linus Torvalds bac5e54c29 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)
  direct I/O fallback sync simplification
  ocfs: stop using do_sync_mapping_range
  cleanup blockdev_direct_IO locking
  make generic_acl slightly more generic
  sanitize xattr handler prototypes
  libfs: move EXPORT_SYMBOL for d_alloc_name
  vfs: force reval of target when following LAST_BIND symlinks (try #7)
  ima: limit imbalance msg
  Untangling ima mess, part 3: kill dead code in ima
  Untangling ima mess, part 2: deal with counters
  Untangling ima mess, part 1: alloc_file()
  O_TRUNC open shouldn't fail after file truncation
  ima: call ima_inode_free ima_inode_free
  IMA: clean up the IMA counts updating code
  ima: only insert at inode creation time
  ima: valid return code from ima_inode_alloc
  fs: move get_empty_filp() deffinition to internal.h
  Sanitize exec_permission_lite()
  Kill cached_lookup() and real_lookup()
  Kill path_lookup_open()
  ...

Trivial conflicts in fs/direct-io.c
2009-12-16 12:04:02 -08:00
..
Kconfig nfsd : Define NFSD only when FILE_LOCKING is enabled 2009-03-18 17:30:48 -04:00
Makefile knfsd: trivial makefile cleanup 2007-05-09 12:30:54 -07:00
auth.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
auth.h nfsd: minor fs/nfsd/auth.h cleanup 2008-02-01 16:42:05 -05:00
cache.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
export.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
lockd.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs2acl.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs3acl.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs3proc.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs3xdr.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4acl.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4callback.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4idmap.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4proc.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4recover.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4state.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfs4xdr.c nfsd: filter readdir results in V4ROOT case 2009-12-15 14:07:24 -05:00
nfscache.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfsctl.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfsd.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfsfh.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfsfh.h nfsd: move most of nfsfh.h to fs/nfsd 2009-12-15 15:01:46 -05:00
nfsproc.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfssvc.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
nfsxdr.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
state.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
stats.c nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
vfs.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2009-12-16 12:04:02 -08:00
vfs.h nfsd: move most of nfsfh.h to fs/nfsd 2009-12-15 15:01:46 -05:00
xdr.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
xdr3.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00
xdr4.h nfsd: remove pointless paths in file headers 2009-12-15 15:01:47 -05:00