aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorMark Fasheh <mark.fasheh@oracle.com>2007-09-20 14:19:20 -0400
committerMark Fasheh <mark.fasheh@oracle.com>2007-10-12 14:54:34 -0400
commit92e91ce2a30b2af53ebf077512801dc01e75cca5 (patch)
tree94683566a3ffa137d8c053acd858fadf47fe5b86 /fs/ocfs2
parentbddb8eb37f1460fc19e1af16010c9ad4ca3717a6 (diff)
ocfs2: Sync ocfs2_fs.h with ocfs2-tools
ocfs2-tools added some on-disk fields and flags which are used by tunefs.ocfs2. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/ocfs2_fs.h20
1 files changed, 18 insertions, 2 deletions
diff --git a/fs/ocfs2/ocfs2_fs.h b/fs/ocfs2/ocfs2_fs.h
index 82f8a75b207e..bf10a5453833 100644
--- a/fs/ocfs2/ocfs2_fs.h
+++ b/fs/ocfs2/ocfs2_fs.h
@@ -111,6 +111,17 @@
111#define OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC 0x0010 111#define OCFS2_FEATURE_INCOMPAT_SPARSE_ALLOC 0x0010
112 112
113/* 113/*
114 * Tunefs sets this incompat flag before starting an operation which
115 * would require cleanup on abort. This is done to protect users from
116 * inadvertently mounting the fs after an aborted run without
117 * fsck-ing.
118 *
119 * s_tunefs_flags on the super block describes precisely which
120 * operations were in progress.
121 */
122#define OCFS2_FEATURE_INCOMPAT_TUNEFS_INPROG 0x0020
123
124/*
114 * backup superblock flag is used to indicate that this volume 125 * backup superblock flag is used to indicate that this volume
115 * has backup superblocks. 126 * has backup superblocks.
116 */ 127 */
@@ -130,6 +141,11 @@
130#define OCFS2_MAX_BACKUP_SUPERBLOCKS 6 141#define OCFS2_MAX_BACKUP_SUPERBLOCKS 6
131 142
132/* 143/*
144 * Flags on ocfs2_super_block.s_tunefs_flags
145 */
146#define OCFS2_TUNEFS_INPROG_REMOVE_SLOT 0x0001 /* Removing slots */
147
148/*
133 * Flags on ocfs2_dinode.i_flags 149 * Flags on ocfs2_dinode.i_flags
134 */ 150 */
135#define OCFS2_VALID_FL (0x00000001) /* Inode is valid */ 151#define OCFS2_VALID_FL (0x00000001) /* Inode is valid */
@@ -447,8 +463,8 @@ struct ocfs2_super_block {
447 __le32 s_clustersize_bits; /* Clustersize for this fs */ 463 __le32 s_clustersize_bits; /* Clustersize for this fs */
448/*40*/ __le16 s_max_slots; /* Max number of simultaneous mounts 464/*40*/ __le16 s_max_slots; /* Max number of simultaneous mounts
449 before tunefs required */ 465 before tunefs required */
450 __le16 s_reserved1; 466 __le16 s_tunefs_flag;
451 __le32 s_reserved2; 467 __le32 s_reserved1;
452 __le64 s_first_cluster_group; /* Block offset of 1st cluster 468 __le64 s_first_cluster_group; /* Block offset of 1st cluster
453 * group header */ 469 * group header */
454/*50*/ __u8 s_label[OCFS2_MAX_VOL_LABEL_LEN]; /* Label for mounting, etc. */ 470/*50*/ __u8 s_label[OCFS2_MAX_VOL_LABEL_LEN]; /* Label for mounting, etc. */