| Date | Sun, 09 Sep 2012 23:41:54 +0100 | From | Ben Hutchings <> | Subject | [ 04/95] NFSv4.1 fix page number calculation bug for filelayout decode buffers |
| |
3.2-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Adamson <andros@netapp.com>
commit e5265a0c587423bbd21a6b39a572cecff16b9346 upstream.
Signed-off-by: Andy Adamson <andros@netapp.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- fs/nfs/nfs4filelayoutdev.c | 2 +- fs/nfs/pnfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
--- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -721,7 +721,7 @@ get_device_info(struct inode *inode, str * 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); --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -588,7 +588,7 @@ send_layoutget(struct pnfs_layout_hdr *l /* 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)
|