Attachment 583024 Details for Bug 758202 – A backported version up the upstream patch

[patch] A backported version up the upstream patch

0001-NFSv4.1-fix-page-number-calculation-bug-for-filelayo.patch (text/plain), 1.48 KB, created by Steve Dickson on 2012-05-08 15:40:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2012-05-08 15:40:33 UTC

Size: 1.48 KB

patch

obsolete

>From 4bfb80a21e2eb2a03dece94263ba428a934b7639 Mon Sep 17 00:00:00 2001
>From: Andy Adamson <andros@netapp.com>
>Date: Sat, 14 Apr 2012 03:56:35 -0400
>Subject: [PATCH] NFSv4.1 fix page number calculation bug for filelayout decode buffers
>
>Signed-off-by: Andy Adamson <andros@netapp.com>
>Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>---
> fs/nfs/nfs4filelayoutdev.c |    2 +-
> fs/nfs/pnfs.c              |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c
>index bf3ea1d..2e9d49b 100644
>--- a/fs/nfs/nfs4filelayoutdev.c
>+++ b/fs/nfs/nfs4filelayoutdev.c
>@@ -503,7 +503,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/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
>index 6b6006d..7151d54 100644
>--- a/fs/nfs/pnfs.c
>+++ b/fs/nfs/pnfs.c
>@@ -490,7 +490,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 = kzalloc(max_pages * sizeof(struct page *), gfp_flags);
> 	if (!pages)
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 758202: 582994 | 583024