diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-20 06:34:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-20 06:34:03 -0800 |
| commit | cbfe51cb958f4e0f4f5c0fd74593018109a98d8d (patch) | |
| tree | 3a023ea7974b81888a4e27d28b3ba89b3b01ec66 /include/linux | |
| parent | e7e4d66f62ca3b92347906a3cb5e6d5b247753f2 (diff) | |
| parent | 0607be177ff3076f119ff8ded85ba36615fc5f9a (diff) | |
Merge clashes between the req_offset() and the XDR cleanups
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/nfs_fs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index c06c2d882bf5..bc44563921f7 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; } /* |