diff --git a/[refs] b/[refs] index 75355b68badb..389a3f2b5fc2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d24aae41b4d4141d4f3cffdbf4c31d85637ba691 +refs/heads/master: bf4285e75c3272ad9bfdeb886d247962bb2985f8 diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index fbd64f2fa7f9..5ac5b27b639a 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -939,7 +939,7 @@ static int nfs_flush_one(struct inode *inode, struct list_head *head, unsigned i static void nfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, int ioflags) { - int wsize = NFS_SERVER(inode)->wsize; + size_t wsize = NFS_SERVER(inode)->wsize; if (wsize < PAGE_CACHE_SIZE) nfs_pageio_init(pgio, inode, nfs_flush_multi, wsize, ioflags);