summaryrefslogtreecommitdiffstats
path: root/fs/ioctl.c
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-09-15 05:20:00 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-09-15 22:29:52 +0200
commit5297e0f0fe13305a1fc7f01986be0dccd063d57a (patch)
treeb2ca0801594de4a97354a558f6a40dcc6ceb3cd6 /fs/ioctl.c
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-block (diff)
downloadlinux-5297e0f0fe13305a1fc7f01986be0dccd063d57a.tar.xz
linux-5297e0f0fe13305a1fc7f01986be0dccd063d57a.zip
vfs: fix return type of ioctl_file_dedupe_range
All the VFS functions in the dedupe ioctl path return int status, so the ioctl handler ought to as well. Found by Coverity, CID 1350952. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ioctl.c')
-rw-r--r--fs/ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ioctl.c b/fs/ioctl.c
index 0f56deb24ce6..26aba0942a98 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -568,7 +568,7 @@ static int ioctl_fsthaw(struct file *filp)
return thaw_super(sb);
}
-static long ioctl_file_dedupe_range(struct file *file, void __user *arg)
+static int ioctl_file_dedupe_range(struct file *file, void __user *arg)
{
struct file_dedupe_range __user *argp = arg;
struct file_dedupe_range *same = NULL;