summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChuck Lever <cel@citi.umich.edu>2002-12-20 06:27:42 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-12-20 06:27:42 -0800
commit0607be177ff3076f119ff8ded85ba36615fc5f9a (patch)
treec4a4f91f1b91022f748850a81317c9ac75886454 /include
parent756e3174a1b2b80cdb688a9871926a07a54ba0a3 (diff)
[PATCH] cleanup: simplify req_offset function in NFS client
Description: everywhere the NFS client uses the req_offset() function today, it adds req->wb_offset to the result. this patch simply makes "+req->wb_offset" a part of the req_offset() function. Test status: Passes all Connectathon '02 tests with v2, v3, UDP and TCP. Passes NFS torture tests on an x86 UP highmem system.
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_fs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 2673e32cc4ba..bddf1207c3a8 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -222,7 +222,7 @@ loff_t page_offset(struct page *page)
static inline
loff_t req_offset(struct nfs_page *req)
{
- return ((loff_t)req->wb_index) << PAGE_CACHE_SHIFT;
+ return (((loff_t)req->wb_index) << PAGE_CACHE_SHIFT) + req->wb_offset;
}
/*