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, 10 insertions, 3 deletions

diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index 29c0ca7fc347..ff8200772377 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -448,11 +448,17 @@ pnfs_destroy_layout(struct nfs_inode *nfsi)
 void
 pnfs_destroy_all_layouts(struct nfs_client *clp)
 {
+        struct nfs_server *server;
         struct pnfs_layout_hdr *lo;
         LIST_HEAD(tmp_list);
 
         spin_lock(&clp->cl_lock);
-        list_splice_init(&clp->cl_layouts, &tmp_list);
+        rcu_read_lock();
+        list_for_each_entry_rcu(server, &clp->cl_superblocks, client_link) {
+                if (!list_empty(&server->layouts))
+                        list_splice_init(&server->layouts, &tmp_list);
+        }
+        rcu_read_unlock();
         spin_unlock(&clp->cl_lock);
 
         while (!list_empty(&tmp_list)) {
@@ -920,7 +926,8 @@ pnfs_update_layout(struct inode *ino,
         };
         unsigned pg_offset;
         struct nfs_inode *nfsi = NFS_I(ino);
-        struct nfs_client *clp = NFS_SERVER(ino)->nfs_client;
+        struct nfs_server *server = NFS_SERVER(ino);
+        struct nfs_client *clp = server->nfs_client;
         struct pnfs_layout_hdr *lo;
         struct pnfs_layout_segment *lseg = NULL;
         bool first = false;
@@ -964,7 +971,7 @@ pnfs_update_layout(struct inode *ino,
                  */
                 spin_lock(&clp->cl_lock);
                 BUG_ON(!list_empty(&lo->plh_layouts));
-                list_add_tail(&lo->plh_layouts, &clp->cl_layouts);
+                list_add_tail(&lo->plh_layouts, &server->layouts);
                 spin_unlock(&clp->cl_lock);
         }