Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
Linus Torvalds [Tue, 26 Oct 2010 16:52:09 +0000 (09:52 -0700)]
* 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
  net/sunrpc: Use static const char arrays
  nfs4: fix channel attribute sanity-checks
  NFSv4.1: Use more sensible names for 'initialize_mountpoint'
  NFSv4.1: pnfs: filelayout: add driver's LAYOUTGET and GETDEVICEINFO infrastructure
  NFSv4.1: pnfs: add LAYOUTGET and GETDEVICEINFO infrastructure
  NFS: client needs to maintain list of inodes with active layouts
  NFS: create and destroy inode's layout cache
  NFSv4.1: pnfs: filelayout: introduce minimal file layout driver
  NFSv4.1: pnfs: full mount/umount infrastructure
  NFS: set layout driver
  NFS: ask for layouttypes during v4 fsinfo call
  NFS: change stateid to be a union
  NFSv4.1: pnfsd, pnfs: protocol level pnfs constants
  SUNRPC: define xdr_decode_opaque_fixed
  NFSD: remove duplicate NFS4_STATEID_SIZE

1  2 
fs/nfs/Kconfig
fs/nfs/client.c
fs/nfs/file.c
fs/nfs/nfs4state.c
include/linux/nfs_fs.h
net/sunrpc/auth_gss/gss_krb5_mech.c

diff --cc fs/nfs/Kconfig
Simple merge
diff --cc fs/nfs/client.c
Simple merge
diff --cc fs/nfs/file.c
Simple merge
Simple merge
@@@ -185,9 -185,12 +185,12 @@@ struct nfs_inode 
        struct nfs4_cached_acl  *nfs4_acl;
          /* NFSv4 state */
        struct list_head        open_states;
 -      struct nfs_delegation   *delegation;
 +      struct nfs_delegation __rcu *delegation;
        fmode_t                  delegation_state;
        struct rw_semaphore     rwsem;
+       /* pNFS layout information */
+       struct pnfs_layout_hdr *layout;
  #endif /* CONFIG_NFS_V4*/
  #ifdef CONFIG_NFS_FSCACHE
        struct fscache_cookie   *fscache;
Simple merge