Fix bad printk in the test filesystem patch
[ext4-patch-queue.git] / test-filesys-flag.patch
blob051125f92627c4eeb70d3befbfa74595de50c5ef
1 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
2 index 055a0cd..8a405ae 100644
3 --- a/fs/ext4/super.c
4 +++ b/fs/ext4/super.c
5 @@ -1926,6 +1926,17 @@ static int ext4_fill_super (struct super_block *sb, void *data, int silent)
6 printk(KERN_WARNING
7 "EXT4-fs warning: feature flags set on rev 0 fs, "
8 "running e2fsck is recommended\n");
10 + /*
11 + * Since ext4 is still considered development code, we require
12 + * that the TEST_FILESYS flag in s->flags be set.
13 + */
14 + if (!(le32_to_cpu(es->s_flags) & EXT2_FLAGS_TEST_FILESYS)) {
15 + printk(KERN_WARNING "EXT4-fs: %s: not marked "
16 + "OK to use with test code.\n", sb->s_id);
17 + goto failed_mount;
18 + }
21 * Check feature flags regardless of the revision level, since we
22 * previously didn't change the revision level when setting the flags,
23 diff --git a/include/linux/ext4_fs.h b/include/linux/ext4_fs.h
24 index 1852313..285fa6c 100644
25 --- a/include/linux/ext4_fs.h
26 +++ b/include/linux/ext4_fs.h
27 @@ -490,6 +490,13 @@ do { \
28 #define EXT4_ORPHAN_FS 0x0004 /* Orphans being recovered */
31 + * Misc. filesystem flags
32 + */
33 +#define EXT2_FLAGS_SIGNED_HASH 0x0001 /* Signed dirhash in use */
34 +#define EXT2_FLAGS_UNSIGNED_HASH 0x0002 /* Unsigned dirhash in use */
35 +#define EXT2_FLAGS_TEST_FILESYS 0x0004 /* OK for use on development code */
37 +/*
38 * Mount flags
40 #define EXT4_MOUNT_CHECK 0x00001 /* Do mount-time checks */