Commit 50ab8ec7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Trond Myklebust

nfs: fix nfs_size_to_loff_t

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()")
Cc: stable@vger.kernel.org # 2.6.23+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 388f7b1d
...@@ -550,9 +550,7 @@ extern int nfs_readpage_async(struct nfs_open_context *, struct inode *, ...@@ -550,9 +550,7 @@ extern int nfs_readpage_async(struct nfs_open_context *, struct inode *,
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