From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 26 Oct 2010 16:52:09 +0000 (-0700)
Subject: Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
X-Git-Tag: v2.6.37-rc1~114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4dd8dce14014665862ce7911b38cb2c69e366dd;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'nfs-for-2.6.37' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

* '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
---

a4dd8dce14014665862ce7911b38cb2c69e366dd
diff --cc include/linux/nfs_fs.h
index a46e430,0833bb6..bba2668
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@@ -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;