Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...
Linus Torvalds [Sun, 30 May 2010 16:11:11 +0000 (09:11 -0700)]
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Convert quota statistics to generic percpu_counter
  ext3 uses rb_node = NULL; to zero rb_root.
  quota: Fixup dquot_transfer
  reiserfs: Fix resuming of quotas on remount read-write
  pohmelfs: Remove dead quota code
  ufs: Remove dead quota code
  udf: Remove dead quota code
  quota: rename default quotactl methods to dquot_
  quota: explicitly set ->dq_op and ->s_qcop
  quota: drop remount argument to ->quota_on and ->quota_off
  quota: move unmount handling into the filesystem
  quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
  quota: move remount handling into the filesystem
  ocfs2: Fix use after free on remount read-only

Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c

1  2 
drivers/staging/pohmelfs/inode.c
fs/ext4/super.c
fs/quota/dquot.c
fs/super.c
fs/udf/file.c
fs/ufs/file.c
fs/ufs/super.c
fs/ufs/truncate.c
include/linux/quotaops.h

Simple merge
diff --cc fs/ext4/super.c
@@@ -3716,9 -3721,8 +3724,11 @@@ static int ext4_remount(struct super_bl
  #endif
        unlock_super(sb);
        unlock_kernel();
+       if (enable_quota)
+               dquot_resume(sb, -1);
 +
 +      ext4_msg(sb, KERN_INFO, "re-mounted. Opts: %s", orig_data);
 +      kfree(orig_data);
        return 0;
  
  restore_opts:
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc fs/udf/file.c
Simple merge
diff --cc fs/ufs/file.c
@@@ -41,7 -40,7 +40,7 @@@ const struct file_operations ufs_file_o
        .write          = do_sync_write,
        .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
-       .open           = dquot_file_open,
+       .open           = generic_file_open,
 -      .fsync          = simple_fsync,
 +      .fsync          = generic_file_fsync,
        .splice_read    = generic_file_splice_read,
  };
diff --cc fs/ufs/super.c
Simple merge
Simple merge
Simple merge