Merge branch 'for_linus' into for_linus_merged
Theodore Ts'o [Tue, 10 Jan 2012 16:54:07 +0000 (11:54 -0500)]
Conflicts:
fs/ext4/ioctl.c

1  2 
fs/ext4/ext4.h
fs/ext4/extents.c
fs/ext4/ialloc.c
fs/ext4/inode.c
fs/ext4/ioctl.c
fs/ext4/super.c
fs/ext4/xattr_security.c

diff --cc fs/ext4/ext4.h
Simple merge
Simple merge
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
diff --cc 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) {
                }
                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;
        }
  
  
                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) {
                }
                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;
        }
  
diff --cc fs/ext4/super.c
Simple merge
Simple merge