aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorAkira Fujita <a-fujita@rs.jp.nec.com>2009-09-05 22:46:29 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-14 08:06:24 -0800
commitde48efe24d0e6a2291dc4fe23271b5e5b16b01a7 (patch)
tree11ffae77fe227ba6c5b7c0f2d8e3e6dcb2c16a9e /fs
parent4062fc4957707493ff8d53d21c058838a8425f2a (diff)
ext4: Return exchanged blocks count to user space in failure
(cherry picked from commit 8d6669133d8cdbb7cbe0e1f0f3744e7802a84afe) Return exchanged blocks count (moved_len) to user space, if ext4_move_extents() failed on the way. Signed-off-by: Akira Fujita <a-fujita@rs.jp.nec.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/ioctl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 7050a9cd04a..c1cdf613e72 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -243,10 +243,9 @@ setversion_out:
me.donor_start, me.len, &me.moved_len);
fput(donor_filp);
- if (!err)
- if (copy_to_user((struct move_extent *)arg,
- &me, sizeof(me)))
- return -EFAULT;
+ if (copy_to_user((struct move_extent *)arg, &me, sizeof(me)))
+ return -EFAULT;
+
return err;
}