summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-12-19 15:13:26 -0800
committerAl Viro <viro@zeniv.linux.org.uk>2016-12-22 23:00:23 -0500
commit22725ce4e4a00fbc37694e25dc5c8acef8ad1c28 (patch)
treec2f79e95c3aba6279faa3967a14ac9cd0d629022 /fs/ocfs2
parent33844e665104b169a3a7732bdcddb40e4f82b335 (diff)
downloadlinux-stable-22725ce4e4a00fbc37694e25dc5c8acef8ad1c28.tar.gz
linux-stable-22725ce4e4a00fbc37694e25dc5c8acef8ad1c28.tar.bz2
linux-stable-22725ce4e4a00fbc37694e25dc5c8acef8ad1c28.zip
vfs: fix isize/pos/len checks for reflink & dedupe
Strengthen the checking of pos/len vs. i_size, clarify the return values for the clone prep function, and remove pointless code. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/refcounttree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
index d171d2c53f7f..f8933cb53d68 100644
--- a/fs/ocfs2/refcounttree.c
+++ b/fs/ocfs2/refcounttree.c
@@ -4834,7 +4834,7 @@ int ocfs2_reflink_remap_range(struct file *file_in,
ret = vfs_clone_file_prep_inodes(inode_in, pos_in, inode_out, pos_out,
&len, is_dedupe);
- if (ret || len == 0)
+ if (ret <= 0)
goto out_unlock;
/* Lock out changes to the allocation maps and remap. */