Commit 29e3552e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Luis Henriques

nfs: fix nfs_size_to_loff_t

commit 50ab8ec7 upstream.

See http: //www.infradead.org/rpr.html
X-Evolution-Source: 1451162204.2173.11@leira.trondhjem.org
Content-Transfer-Encoding: 8bit
Mime-Version: 1.0

We support OFFSET_MAX just fine, so don't round down below it.  Also
switch to using min_t to make the helper more readable.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Fixes: 433c9237 ("NFS: Clean up nfs_size_to_loff_t()")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 63ce06ed
...@@ -577,9 +577,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, ...@@ -577,9 +577,7 @@ static inline int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
static inline loff_t nfs_size_to_loff_t(__u64 size) static inline loff_t nfs_size_to_loff_t(__u64 size)
{ {
if (size > (__u64) OFFSET_MAX - 1) return min_t(u64, size, OFFSET_MAX);
return OFFSET_MAX - 1;
return (loff_t) size;
} }
static inline ino_t static inline ino_t
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment