linux-next: manual merge of the vfs tree with the ext3 tree

From: Stephen Rothwell
Date: Wed Jan 04 2012 - 21:06:20 EST


Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
include/linux/fs.h between commit 4789fd4495a4 ("quota: Fix deadlock with
suspend and quotas") from the ext3 tree and commit cf31e70d6cf9 ("vfs:
new helper - vfs_ustat()") from the vfs tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/fs.h
index 3aba12c,7aacf31..0000000
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@@ -2531,8 -2489,6 +2489,7 @@@ extern void put_filesystem(struct file_
extern struct file_system_type *get_fs_type(const char *name);
extern struct super_block *get_super(struct block_device *);
extern struct super_block *get_active_super(struct block_device *bdev);
- extern struct super_block *user_get_super(dev_t);
+extern void put_super(struct super_block *sb);
extern void drop_super(struct super_block *sb);
extern void iterate_supers(void (*)(struct super_block *, void *), void *);
extern void iterate_supers_type(struct file_system_type *,

Attachment: pgp00000.pgp
Description: PGP signature