From 8610f76a0417aba8b2c219a704fab4446ac322c1 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 21 Dec 2011 14:14:31 -0500 Subject: [PATCH] --- yaml --- r: 282959 b: refs/heads/master c: 22cdfca5641817060dd724a9c30442f5c0675fcd h: refs/heads/master i: 282957: d1372f1332f69fdd18ab0e524e54bf092e14f3c1 282955: e50ef388273ab0f922ca0ae3f10091c375f1c6c8 282951: ab3b0bfdf1fe232eb6834a6af7f8b8bfc29284a8 282943: 1d8a1dde88bd111395b1c30d057fc5a516f9aa26 v: v3 --- [refs] | 2 +- trunk/fs/ext4/ioctl.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f4e2b8d57abc..e9cb5c076a48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c48f7e88e293b9dd422bd8884842aea85d30b22 +refs/heads/master: 22cdfca5641817060dd724a9c30442f5c0675fcd diff --git a/trunk/fs/ext4/ioctl.c b/trunk/fs/ext4/ioctl.c index a56796814d6a..ff1aab7cd6e8 100644 --- a/trunk/fs/ext4/ioctl.c +++ b/trunk/fs/ext4/ioctl.c @@ -247,8 +247,6 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) err = ext4_move_extents(filp, donor_filp, me.orig_start, me.donor_start, me.len, &me.moved_len); mnt_drop_write(filp->f_path.mnt); - if (me.moved_len > 0) - file_remove_suid(donor_filp); if (copy_to_user((struct move_extent __user *)arg, &me, sizeof(me)))