linux-stable/fs/nfs
Trond Myklebust 959d921f5e Merge branch 'labeled-nfs' into linux-next
* labeled-nfs:
  NFS: Apply v4.1 capabilities to v4.2
  NFS: Add in v4.2 callback operation
  NFS: Make callbacks minor version generic
  Kconfig: Add Kconfig entry for Labeled NFS V4 client
  NFS: Extend NFS xattr handlers to accept the security namespace
  NFS: Client implementation of Labeled-NFS
  NFS: Add label lifecycle management
  NFS:Add labels to client function prototypes
  NFSv4: Extend fattr bitmaps to support all 3 words
  NFSv4: Introduce new label structure
  NFSv4: Add label recommended attribute and NFSv4 flags
  NFSv4.2: Added NFS v4.2 support to the NFS client
  SELinux: Add new labeling type native labels
  LSM: Add flags field to security_sb_set_mnt_opts for in kernel mount data.
  Security: Add Hook to test if the particular xattr is part of a MAC model.
  Security: Add hook to calculate context based on a negative dentry.
  NFS: Add NFSv4.2 protocol constants

Conflicts:
	fs/nfs/nfs4proc.c
2013-06-28 16:29:51 -04:00
..
blocklayout NFSv4.1 use pnfs_device maxcount for the blocklayout gdia_maxcount 2013-06-28 15:34:44 -04:00
objlayout NFSv4.1 use pnfs_device maxcount for the objectlayout gdia_maxcount 2013-06-28 15:34:45 -04:00
cache_lib.c NFS: simplify and clean cache library 2013-02-15 10:43:36 -05:00
cache_lib.h NFS: simplify and clean cache library 2013-02-15 10:43:36 -05:00
callback.c NFSv4.2: Added NFS v4.2 support to the NFS client 2013-06-08 16:20:13 -04:00
callback.h NFS: Add in v4.2 callback operation 2013-06-08 16:20:18 -04:00
callback_proc.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
callback_xdr.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
client.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
delegation.c nfs: remove unnecessary check for NULL inode->i_flock from nfs_delegation_claim_locks 2013-04-10 15:40:31 -04:00
delegation.h NFSv4: Fix CB_RECALL_ANY to only return delegations that are not in use 2013-04-05 17:03:57 -04:00
dir.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
direct.c
dns_resolve.c NFSv4: Move the DNS resolver into the NFSv4 module 2013-06-18 13:47:18 -04:00
dns_resolve.h
file.c NFS: Ensure that NFS file unlock waits for readahead to complete 2013-04-08 22:12:42 -04:00
fscache-index.c
fscache.c
fscache.h
getroot.c NFS:Add labels to client function prototypes 2013-06-08 16:20:15 -04:00
idmap.c NFS: Improve legacy idmapping fallback 2013-06-28 15:22:07 -04:00
inode.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
internal.h Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
iostat.h
Kconfig Kconfig: Add Kconfig entry for Labeled NFS V4 client 2013-06-08 16:20:17 -04:00
Makefile NFSv4: Move the DNS resolver into the NFSv4 module 2013-06-18 13:47:18 -04:00
mount_clnt.c nfs: have nfs_mount fake up a auth_flavs list when the server didn't provide it 2013-06-28 15:51:51 -04:00
namespace.c NFS:Add labels to client function prototypes 2013-06-08 16:20:15 -04:00
netns.h
nfs.h
nfs2super.c
nfs2xdr.c nfs: Convert nfs2xdr to use kuids and kgids 2013-02-13 06:15:30 -08:00
nfs3acl.c
nfs3client.c
nfs3proc.c NFS:Add labels to client function prototypes 2013-06-08 16:20:15 -04:00
nfs3super.c
nfs3xdr.c nfs: Convert nfs3xdr to use kuids and kgids 2013-02-13 06:15:31 -08:00
nfs4_fs.h Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
nfs4client.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
nfs4file.c NFSv4: Move dentry instantiation into the NFSv4-specific atomic open code 2013-06-06 16:24:43 -04:00
nfs4filelayout.c NFSv4.1: Use layout credentials for get_deviceinfo calls 2013-06-06 16:24:37 -04:00
nfs4filelayout.h NFSv4.1: Use layout credentials for get_deviceinfo calls 2013-06-06 16:24:37 -04:00
nfs4filelayoutdev.c NFSv4.1 Fix gdia_maxcount calculation to fit in ca_maxresponsesize 2013-06-28 15:34:43 -04:00
nfs4getroot.c
nfs4namespace.c SUNRPC: Introduce rpcauth_get_pseudoflavor() 2013-03-29 15:43:07 -04:00
nfs4proc.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
nfs4renewd.c
nfs4session.c NFSv4.1 Refactor nfs4_init_session and nfs4_init_channel_attrs 2013-06-28 15:55:19 -04:00
nfs4session.h NFSv4.1 Refactor nfs4_init_session and nfs4_init_channel_attrs 2013-06-28 15:55:19 -04:00
nfs4state.c NFSv4.1 end back channel session draining 2013-06-20 10:19:21 -04:00
nfs4super.c NFSv4: Move the DNS resolver into the NFSv4 module 2013-06-18 13:47:18 -04:00
nfs4sysctl.c
nfs4xdr.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
nfsroot.c
pagelist.c NFS: Add functionality to allow waiting on all outstanding reads to complete 2013-04-08 22:12:33 -04:00
pnfs.c NFSv4.1: Clean up layout segment comparison helper names 2013-06-18 13:47:18 -04:00
pnfs.h NFSv4.1 Fix gdia_maxcount calculation to fit in ca_maxresponsesize 2013-06-28 15:34:43 -04:00
pnfs_dev.c hlist: drop the node parameter from iterators 2013-02-27 19:10:24 -08:00
proc.c NFS:Add labels to client function prototypes 2013-06-08 16:20:15 -04:00
read.c NFS: Don't accept more reads/writes if the open context recovery failed 2013-03-25 12:04:10 -04:00
super.c Merge branch 'labeled-nfs' into linux-next 2013-06-28 16:29:51 -04:00
symlink.c
sysctl.c
unlink.c NFS: Don't allow NFS silly-renamed files to be deleted, no signal 2013-02-22 14:55:34 -05:00
write.c NFS: Don't accept more reads/writes if the open context recovery failed 2013-03-25 12:04:10 -04:00