From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 10 Jan 2012 16:54:07 +0000 (-0500)
Subject: Merge branch 'for_linus' into for_linus_merged
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ff9cb1c4eead;p=linux-beck.git

Merge branch 'for_linus' into for_linus_merged

Conflicts:
	fs/ext4/ioctl.c
---

ff9cb1c4eead5e4c292e75cd3170a82d66944101
diff --cc fs/ext4/ioctl.c
index e87a932b073b,b81a5f1b6976..6eee25591b81
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@@ -193,12 -193,13 +197,13 @@@ setversion_out
  			       EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
  			ext4_msg(sb, KERN_ERR,
  				 "Online resizing not supported with bigalloc");
- 			return -EOPNOTSUPP;
+ 			err = -EOPNOTSUPP;
+ 			goto group_extend_out;
  		}
  
 -		err = mnt_want_write(filp->f_path.mnt);
 +		err = mnt_want_write_file(filp);
  		if (err)
- 			return err;
+ 			goto group_extend_out;
  
  		err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count);
  		if (EXT4_SB(sb)->s_journal) {
@@@ -208,9 -209,10 +213,9 @@@
  		}
  		if (err == 0)
  			err = err2;
 -
 -		mnt_drop_write(filp->f_path.mnt);
 +		mnt_drop_write_file(filp);
+ group_extend_out:
  		ext4_resize_end(sb);
- 
  		return err;
  	}
  
@@@ -250,9 -252,7 +255,8 @@@
  
  		err = ext4_move_extents(filp, donor_filp, me.orig_start,
  					me.donor_start, me.len, &me.moved_len);
 +		mnt_drop_write_file(filp);
- 		if (me.moved_len > 0)
- 			file_remove_suid(donor_filp);
+ 		mnt_drop_write(filp->f_path.mnt);
  
  		if (copy_to_user((struct move_extent __user *)arg,
  				 &me, sizeof(me)))
@@@ -278,12 -280,13 +284,13 @@@ mext_out
  			       EXT4_FEATURE_RO_COMPAT_BIGALLOC)) {
  			ext4_msg(sb, KERN_ERR,
  				 "Online resizing not supported with bigalloc");
- 			return -EOPNOTSUPP;
+ 			err = -EOPNOTSUPP;
+ 			goto group_add_out;
  		}
  
 -		err = mnt_want_write(filp->f_path.mnt);
 +		err = mnt_want_write_file(filp);
  		if (err)
- 			return err;
+ 			goto group_add_out;
  
  		err = ext4_group_add(sb, &input);
  		if (EXT4_SB(sb)->s_journal) {
@@@ -293,9 -296,10 +300,9 @@@
  		}
  		if (err == 0)
  			err = err2;
 -
 -		mnt_drop_write(filp->f_path.mnt);
 +		mnt_drop_write_file(filp);
+ group_add_out:
  		ext4_resize_end(sb);
- 
  		return err;
  	}