From b7bd5e7599971d923b44fc6db76227f553a4a45a Mon Sep 17 00:00:00 2001 From: Andy Adamson Date: Sat, 14 Apr 2012 03:56:35 -0400 Subject: [PATCH] --- yaml --- r: 299891 b: refs/heads/master c: e5265a0c587423bbd21a6b39a572cecff16b9346 h: refs/heads/master i: 299889: be38f1ffb62abdef40c782c54f13bc0ced5d43a0 299887: 0893e09acd1ca194817959d3225b27595797fc5f v: v3 --- [refs] | 2 +- trunk/fs/nfs/nfs4filelayoutdev.c | 2 +- trunk/fs/nfs/pnfs.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1fa91cbb6291..3158b2f718a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9526b2b6d6b9f183b66cf21c4afa6e79d5a14f44 +refs/heads/master: e5265a0c587423bbd21a6b39a572cecff16b9346 diff --git a/trunk/fs/nfs/nfs4filelayoutdev.c b/trunk/fs/nfs/nfs4filelayoutdev.c index a866bbd2890a..c9cff9adb2d3 100644 --- a/trunk/fs/nfs/nfs4filelayoutdev.c +++ b/trunk/fs/nfs/nfs4filelayoutdev.c @@ -699,7 +699,7 @@ get_device_info(struct inode *inode, struct nfs4_deviceid *dev_id, gfp_t gfp_fla * GETDEVICEINFO's maxcount */ max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; - max_pages = max_resp_sz >> PAGE_SHIFT; + max_pages = nfs_page_array_len(0, max_resp_sz); dprintk("%s inode %p max_resp_sz %u max_pages %d\n", __func__, inode, max_resp_sz, max_pages); diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c index b5d451586943..38512bcd2e98 100644 --- a/trunk/fs/nfs/pnfs.c +++ b/trunk/fs/nfs/pnfs.c @@ -587,7 +587,7 @@ send_layoutget(struct pnfs_layout_hdr *lo, /* allocate pages for xdr post processing */ max_resp_sz = server->nfs_client->cl_session->fc_attrs.max_resp_sz; - max_pages = max_resp_sz >> PAGE_SHIFT; + max_pages = nfs_page_array_len(0, max_resp_sz); pages = kcalloc(max_pages, sizeof(struct page *), gfp_flags); if (!pages)