From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 May 2010 16:11:11 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux... 
X-Git-Tag: v2.6.35-rc1~10
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=d28619f1563140526e2f84eae436f39206f40a69;p=~andy%2Flinux

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

* '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
---

d28619f1563140526e2f84eae436f39206f40a69
diff --cc fs/ext4/super.c
index 49d88c0597c,381e5a93126..4e8983a9811
--- a/fs/ext4/super.c
+++ b/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:
diff --cc fs/ufs/file.c
index d4c30d1bef8,73655c61240..33afa20d450
--- a/fs/ufs/file.c
+++ b/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,
  };