diff options
author | Peng Tao <bergwolf@gmail.com> | 2012-08-23 12:27:49 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-01 18:37:39 -0400 |
commit | dc182549d439f60c332bf74d7f220a1bccf37da6 (patch) | |
tree | 45732a9c480dbad56262e8e91504d4069248b628 /fs/nfs/client.c | |
parent | 7acdb026818455638543b04b68d4a580c367fba8 (diff) |
NFS41: fix error of setting blocklayoutdriver
After commit e38eb650 (NFS: set_pnfs_layoutdriver() from
nfs4_proc_fsinfo()), set_pnfs_layoutdriver() is called inside
nfs4_proc_fsinfo(), but pnfs_blksize is not set. It causes setting
blocklayoutdriver failure and pnfsblock mount failure.
Cc: stable <stable@vger.kernel.org> [since v3.5]
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r-- | fs/nfs/client.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 57d2a5c3d933..bab3e8af574a 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
@@ -849,7 +849,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server, | |||
849 | if (server->wsize > NFS_MAX_FILE_IO_SIZE) | 849 | if (server->wsize > NFS_MAX_FILE_IO_SIZE) |
850 | server->wsize = NFS_MAX_FILE_IO_SIZE; | 850 | server->wsize = NFS_MAX_FILE_IO_SIZE; |
851 | server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; | 851 | server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT; |
852 | server->pnfs_blksize = fsinfo->blksize; | ||
853 | 852 | ||
854 | server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL); | 853 | server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL); |
855 | 854 | ||