* linux-next: manual merge of the ext4 tree with the ext3 tree
@ 2010-05-22 5:45 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2010-05-22 5:45 UTC (permalink / raw)
To: Theodore Tso
Cc: linux-next, linux-kernel, Christoph Hellwig, Jan Kara, Curt Wohlgemuth
Hi Ted,
Today's linux-next merge of the ext4 tree got a conflict in
fs/ext4/super.c between commits c3d0adcbfef01b69c455ae21aea1ca78ede127db
("quota: move remount handling into the filesystem") and
96bfb05b3177d4d381c136a2c3f44b63cec97f7b ("quota: kill the vfs_dq_off and
vfs_dq_quota_on_remount wrappers") from the ext3 tree and commit
c4cbd7f1cf34e045668b70fa84b0acb217acb807 ("ext4: Print mount options in
when mounting and add a remount message") from the ext4 tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/ext4/super.c
index 381e5a9,2e8790e..0000000
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -3721,8 -3716,9 +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:
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-05-22 6:32 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-22 5:45 linux-next: manual merge of the ext4 tree with the ext3 tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).