NFS: set_pnfs_layoutdriver() from nfs4_proc_fsinfo()

The generic client doesn't need to know about pnfs layout drivers, so
this should be done in the v4 code.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index f005b5bebdc7..e646b14024c1 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -975,7 +975,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,
                 server->wsize = NFS_MAX_FILE_IO_SIZE;
         server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
         server->pnfs_blksize = fsinfo->blksize;
-        set_pnfs_layoutdriver(server, mntfh, fsinfo->layouttype);
 
         server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);
 
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index c84c93c4cd36..e9a8ad2df7af 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3332,8 +3332,14 @@ static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, str
 
 static int nfs4_proc_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
 {
+        int error;
+
         nfs_fattr_init(fsinfo->fattr);
-        return nfs4_do_fsinfo(server, fhandle, fsinfo);
+        error = nfs4_do_fsinfo(server, fhandle, fsinfo);
+        if (error == 0)
+                set_pnfs_layoutdriver(server, fhandle, fsinfo->layouttype);
+
+        return error;
 }
 
 static int _nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,