From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Fri, 4 May 2007 18:44:06 +0000 (-0400)
Subject: NFS: Fix a compile glitch on 64-bit systems
X-Git-Tag: v2.6.22-rc1~1035^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84dde76c4a2d99ed2d7de6ec82c53b56620900a3;p=linux-2.6

NFS: Fix a compile glitch on 64-bit systems

fs/nfs/pagelist.c:226: error: conflicting types for 'nfs_pageio_init'
include/linux/nfs_page.h:80: error: previous declaration of 'nfs_pageio_init' was here

Thanks to Andrew for spotting this...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c
index fe90130bd7..388950118f 100644
--- a/fs/nfs/pagelist.c
+++ b/fs/nfs/pagelist.c
@@ -228,7 +228,7 @@ out:
 void nfs_pageio_init(struct nfs_pageio_descriptor *desc,
 		     struct inode *inode,
 		     int (*doio)(struct inode *, struct list_head *, unsigned int, size_t, int),
-		     unsigned int bsize,
+		     size_t bsize,
 		     int io_flags)
 {
 	INIT_LIST_HEAD(&desc->pg_list);