From 47a78b0cdb4fba351decd25fd02fe22092b0cb75 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Thu, 20 Sep 2007 11:19:20 -0700 Subject: [PATCH] --- yaml --- r: 67721 b: refs/heads/master c: 92e91ce2a30b2af53ebf077512801dc01e75cca5 h: refs/heads/master i: 67719: 27013bf5ad606020a3a9743561547c73b9a29531 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/ocfs2_fs.h | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 65ab9fefd31a..a861d0218d92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bddb8eb37f1460fc19e1af16010c9ad4ca3717a6 +refs/heads/master: 92e91ce2a30b2af53ebf077512801dc01e75cca5 diff --git a/trunk/fs/ocfs2/ocfs2_fs.h b/trunk/fs/ocfs2/ocfs2_fs.h index 82f8a75b207e..bf10a5453833 100644 --- a/trunk/fs/ocfs2/ocfs2_fs.h +++ b/trunk/fs/ocfs2/ocfs2_fs.h @@ -110,6 +110,17 @@ /* Support for sparse allocation in b-trees */ #define OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC 0x0010 +/* + * Tunefs sets this incompat flag before starting an operation which + * would require cleanup on abort. This is done to protect users from + * inadvertently mounting the fs after an aborted run without + * fsck-ing. + * + * s_tunefs_flags on the super block describes precisely which + * operations were in progress. + */ +#define OCFS2_FEATURE_INCOMPAT_TUNEFS_INPROG 0x0020 + /* * backup superblock flag is used to indicate that this volume * has backup superblocks. @@ -129,6 +140,11 @@ /* the max backup superblock nums */ #define OCFS2_MAX_BACKUP_SUPERBLOCKS 6 +/* + * Flags on ocfs2_super_block.s_tunefs_flags + */ +#define OCFS2_TUNEFS_INPROG_REMOVE_SLOT 0x0001 /* Removing slots */ + /* * Flags on ocfs2_dinode.i_flags */ @@ -447,8 +463,8 @@ struct ocfs2_super_block { __le32 s_clustersize_bits; /* Clustersize for this fs */ /*40*/ __le16 s_max_slots; /* Max number of simultaneous mounts before tunefs required */ - __le16 s_reserved1; - __le32 s_reserved2; + __le16 s_tunefs_flag; + __le32 s_reserved1; __le64 s_first_cluster_group; /* Block offset of 1st cluster * group header */ /*50*/ __u8 s_label[OCFS2_MAX_VOL_LABEL_LEN]; /* Label for mounting, etc. */