From: Christoph Hellwig Date: Mon, 8 Feb 2016 20:11:50 +0000 (+0100) Subject: nfs: fix nfs_size_to_loff_t X-Git-Tag: v3.12.56~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=febaddd7d970970cdd261176fd84d1d605045738;p=thirdparty%2Fkernel%2Fstable.git nfs: fix nfs_size_to_loff_t commit 50ab8ec74a153eb30db26529088bc57dd700b24c 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: Christoph Hellwig Fixes: 433c92379d9c ("NFS: Clean up nfs_size_to_loff_t()") Signed-off-by: Trond Myklebust Signed-off-by: Jiri Slaby --- diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index f4bf1b5933277..1c532adcedc58 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h @@ -604,9 +604,7 @@ static inline void nfs3_forget_cached_acls(struct inode *inode) static inline loff_t nfs_size_to_loff_t(__u64 size) { - if (size > (__u64) OFFSET_MAX - 1) - return OFFSET_MAX - 1; - return (loff_t) size; + return min_t(u64, size, OFFSET_MAX); } static inline ino_t