Commit 50ab8ec7 authored Feb 08, 2016 by Christoph Hellwig Committed by Trond Myklebust Feb 08, 2016

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: Christoph 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: Trond Myklebust <trond.myklebust@primarydata.com>

parent 388f7b1d

include/linux/nfs_fs.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -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)
		{
		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

Admin message