diff --git a/[refs] b/[refs] index f0a6e9e8a81c..aeafd0eb27a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: daea696dbac0e33af3cfe304efbfb8d74e0effe6 +refs/heads/master: 8d6669133d8cdbb7cbe0e1f0f3744e7802a84afe diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c index 7050a9cd04a4..c1cdf613e725 100644 --- a/trunk/fs/ext4/ioctl.c +++ b/trunk/fs/ext4/ioctl.c @@ -243,10 +243,9 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 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; }