From a60e4409c58d47b82abdba51687664d50bb2e374 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 12 Jul 2011 13:42:02 -0400 Subject: [PATCH] --- yaml --- r: 260857 b: refs/heads/master c: d097971d8ab4042eaa4bff98698ae9cc55942327 h: refs/heads/master i: 260855: a1c4846d63afad8726753e3c68ca3af04c7aef9c v: v3 --- [refs] | 2 +- trunk/fs/nfs/read.c | 2 +- trunk/fs/nfs/write.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 43b46a912f24..9552c5af6a41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50828d7e6767a92726708bc0666e2b8b84575808 +refs/heads/master: d097971d8ab4042eaa4bff98698ae9cc55942327 diff --git a/trunk/fs/nfs/read.c b/trunk/fs/nfs/read.c index c14362fbe65f..75088f58183b 100644 --- a/trunk/fs/nfs/read.c +++ b/trunk/fs/nfs/read.c @@ -303,7 +303,7 @@ static int nfs_pagein_multi(struct nfs_pageio_descriptor *desc, struct list_head struct nfs_page *req = nfs_list_entry(desc->pg_list.next); struct page *page = req->wb_page; struct nfs_read_data *data; - size_t rsize = NFS_SERVER(desc->pg_inode)->rsize, nbytes; + size_t rsize = desc->pg_bsize, nbytes; unsigned int offset; int requests = 0; int ret = 0; diff --git a/trunk/fs/nfs/write.c b/trunk/fs/nfs/write.c index 71fbba72ace3..c88a1ab42c39 100644 --- a/trunk/fs/nfs/write.c +++ b/trunk/fs/nfs/write.c @@ -946,7 +946,7 @@ static int nfs_flush_multi(struct nfs_pageio_descriptor *desc, struct list_head struct nfs_page *req = nfs_list_entry(desc->pg_list.next); struct page *page = req->wb_page; struct nfs_write_data *data; - size_t wsize = NFS_SERVER(desc->pg_inode)->wsize, nbytes; + size_t wsize = desc->pg_bsize, nbytes; unsigned int offset; int requests = 0; int ret = 0;