2012-08-08 14:57:52

by Peng Tao

Subject: [PATCH-v2] 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: Bryan Schumaker <[email protected]>
Signed-off-by: Peng Tao <[email protected]>
---
fs/nfs/client.c | 1 -
fs/nfs/nfs4proc.c | 5 ++++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 9fc0d9d..a53a538 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -855,7 +855,6 @@ static void nfs_server_set_fsinfo(struct nfs_server *server,
if (server->wsize > NFS_MAX_FILE_IO_SIZE)
server->wsize = NFS_MAX_FILE_IO_SIZE;
server->wpages = (server->wsize + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
- server->pnfs_blksize = fsinfo->blksize;

server->wtmult = nfs_block_bits(fsinfo->wtmult, NULL);

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 78b2163..299c311 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3362,8 +3362,11 @@ static int nfs4_proc_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, s

nfs_fattr_init(fsinfo->fattr);
error = nfs4_do_fsinfo(server, fhandle, fsinfo);
- if (error == 0)
+ if (error == 0) {
+ /* block layout checks this! */
+ server->pnfs_blksize = fsinfo->blksize;
set_pnfs_layoutdriver(server, fhandle, fsinfo->layouttype);
+ }

return error;
}
--
1.7.1.262.g5ef3d

2012-08-09 09:01:08

by Peng, Tao

Subject: RE: [PATCH-v2] NFS41: fix error of setting blocklayoutdriver

PiAtLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KPiBGcm9tOiBQZW5nIFRhbyBbbWFpbHRvOmJl
cmd3b2xmQGdtYWlsLmNvbV0NCj4gU2VudDogV2VkbmVzZGF5LCBBdWd1c3QgMDgsIDIwMTIgMTA6
NTcgUE0NCj4gVG86IFRyb25kLk15a2xlYnVzdEBuZXRhcHAuY29tDQo+IENjOiBsaW51eC1uZnNA
dmdlci5rZXJuZWwub3JnOyBCcnlhbiBTY2h1bWFrZXI7IFBlbmcsIFRhbw0KPiBTdWJqZWN0OiBb
UEFUQ0gtdjJdIE5GUzQxOiBmaXggZXJyb3Igb2Ygc2V0dGluZyBibG9ja2xheW91dGRyaXZlcg0K
PiANCj4gQWZ0ZXIgY29tbWl0IGUzOGViNjUwIChORlM6IHNldF9wbmZzX2xheW91dGRyaXZlcigp
IGZyb20NCj4gbmZzNF9wcm9jX2ZzaW5mbygpKSwgc2V0X3BuZnNfbGF5b3V0ZHJpdmVyKCkgaXMg
Y2FsbGVkIGluc2lkZQ0KPiBuZnM0X3Byb2NfZnNpbmZvKCksIGJ1dCBwbmZzX2Jsa3NpemUgaXMg
bm90IHNldC4gSXQgY2F1c2VzIHNldHRpbmcNCj4gYmxvY2tsYXlvdXRkcml2ZXIgZmFpbHVyZSBh
bmQgcG5mc2Jsb2NrIG1vdW50IGZhaWx1cmUuDQo+IA0KSnVzdCBub3RpY2VkIHRoYXQgdGhlIGNv
bW1pdCBlMzhlYjY1MCBoYXMgYmVlbiBtZXJnZWQgaW4gMy41IHJlbGVhc2UuIFRyb25kLCBwbGVh
c2UgYWRkIGEgbGluZSB0byBzdGFibGUgd2hlbiB5b3UgbWVyZ2UgdGhlIHBhdGNoLiBUaGFua3Mg
dmVyeSBtdWNoIQ0KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmcgW3YzLjVdDQoNCkNoZWVycywN
ClRhbyANCg0K