]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
fix page number calculation bug for block layout decode buffer
authorJim Rees <rees@umich.edu>
Tue, 10 Apr 2012 02:33:39 +0000 (22:33 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 26 Apr 2012 16:23:23 +0000 (12:23 -0400)
Signed-off-by: Jim Rees <rees@umich.edu>
Suggested-by: Andy Adamson <andros@netapp.com>
Suggested-by: Fred Isaman <iisaman@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/blocklayout/blocklayout.c

index 9c94297bb70e9502c40825249eecb24093e142d2..7f6a23f0244e7340f2861ac6fb0d3a2d20721287 100644 (file)
@@ -38,6 +38,8 @@
 #include <linux/buffer_head.h> /* various write calls */
 #include <linux/prefetch.h>
 
+#include "../pnfs.h"
+#include "../internal.h"
 #include "blocklayout.h"
 
 #define NFSDBG_FACILITY        NFSDBG_PNFS_LD
@@ -868,7 +870,7 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh,
         * 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 max_resp_sz %u max_pages %d\n",
                __func__, max_resp_sz, max_pages);