Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e38eb650 authored by Bryan Schumaker's avatar Bryan Schumaker Committed by Trond Myklebust
Browse files

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: default avatarBryan Schumaker <bjschuma@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6e5b587d

fs/nfs/client.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/nfs/nfs4proc.c

+7 −1
Original line number Diff line number Diff line
@@ -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,