Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=433c92379d9c2c59c2ebc7628fe4fb02cfc2daf8
Commit: 433c92379d9c2c59c2ebc7628fe4fb02cfc2daf8
Parent: 8bda4e4c98d14566fc1a354c62fb59d70cc49b97
Author: Chuck Lever <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 1 12:12:14 2007 -0400
Committer: Trond Myklebust <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 23:40:43 2007 -0400
NFS: Clean up nfs_size_to_loff_t()
Use the same file size limit that lockd uses.
Signed-off-by: Chuck Lever <[EMAIL PROTECTED]>
Signed-off-by: Trond Myklebust <[EMAIL PROTECTED]>
---
include/linux/nfs_fs.h | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index e949710..7deb5b0 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -503,12 +503,10 @@ extern int nfsroot_mount(struct sockaddr_in *, char *,
struct nfs_fh *,
* inline functions
*/
-static inline loff_t
-nfs_size_to_loff_t(__u64 size)
+static inline loff_t nfs_size_to_loff_t(__u64 size)
{
- loff_t maxsz = (((loff_t) ULONG_MAX) << PAGE_CACHE_SHIFT) +
PAGE_CACHE_SIZE - 1;
- if (size > maxsz)
- return maxsz;
+ if (size > (__u64) OFFSET_MAX - 1)
+ return OFFSET_MAX - 1;
return (loff_t) size;
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
