From 005c9c8177a4291024d3ceba1224c4bca2873eca Mon Sep 17 00:00:00 2001 From: Ryusuke Konishi Date: Thu, 22 Jul 2010 03:22:19 +0900 Subject: [PATCH] --- yaml --- r: 206368 b: refs/heads/master c: 1a80a1763fb760b3a84a28df87515f7cdc07a4f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/nilfs2_fs.h | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8fe2678ac30e..65b69ef41230 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f1b7cd29fa4917f19d2624afc773d941684c5df +refs/heads/master: 1a80a1763fb760b3a84a28df87515f7cdc07a4f4 diff --git a/trunk/include/linux/nilfs2_fs.h b/trunk/include/linux/nilfs2_fs.h index cc3465e5be38..7dd4cd494490 100644 --- a/trunk/include/linux/nilfs2_fs.h +++ b/trunk/include/linux/nilfs2_fs.h @@ -212,7 +212,10 @@ struct nilfs_super_block { /*F8*/ __le32 s_c_interval; /* Commit interval of segment */ __le32 s_c_block_max; /* Threshold of data amount for the segment construction */ - __u32 s_reserved[192]; /* padding to the end of the block */ +/*100*/ __le64 s_feature_compat; /* Compatible feature set */ + __le64 s_feature_compat_ro; /* Read-only compatible feature set */ + __le64 s_feature_incompat; /* Incompatible feature set */ + __u32 s_reserved[186]; /* padding to the end of the block */ }; /* @@ -227,6 +230,16 @@ struct nilfs_super_block { #define NILFS_CURRENT_REV 2 /* current major revision */ #define NILFS_MINOR_REV 0 /* minor revision */ +/* + * Feature set definitions + * + * If there is a bit set in the incompatible feature set that the kernel + * doesn't know about, it should refuse to mount the filesystem. + */ +#define NILFS_FEATURE_COMPAT_SUPP 0ULL +#define NILFS_FEATURE_COMPAT_RO_SUPP 0ULL +#define NILFS_FEATURE_INCOMPAT_SUPP 0ULL + /* * Bytes count of super_block for CRC-calculation */