NFS: move pnfs layouts to nfs_server structure

Layouts should be tracked per nfs_server (aka superblock)
instead of per struct nfs_client, which may have multiple FSIDs associated
with it.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index f23b18831559..4faeac8f448a 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -78,7 +78,6 @@ struct nfs_client {
         /* The flags used for obtaining the clientid during EXCHANGE_ID */
         u32                     cl_exchange_flags;
         struct nfs4_session     *cl_session;    /* sharred session */
-        struct list_head        cl_layouts;
 #endif /* CONFIG_NFS_V4 */
 
 #ifdef CONFIG_NFS_FSCACHE
@@ -152,6 +151,7 @@ struct nfs_server {
         struct rb_root          openowner_id;
         struct rb_root          lockowner_id;
 #endif
+        struct list_head        layouts;
         struct list_head        delegations;
         void (*destroy)(struct nfs_server *);