[Cluster-devel] [GFS2] gfs2-utils: make gfs2_jadd set GFS2_DIF_SYSTEM flag on system inodes

[Abhi Das <adas@redhat.com>]

Reuse the VFS FS_RESERVED_FL to set the GFS2_DIF_SYSTEM flag on gfs2
metafs inodes (journals and such) created by gfs2_jadd.

A companion kernel patch that actually does the mapping from the VFS
flag to GFS2 is required in order for this to work correctly.

Resolves: rhbz#1272086
Signed-off-by: Abhi Das <adas@redhat.com>
---
 gfs2/mkfs/main_jadd.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c
index de5d9c5..538d820 100644
--- a/gfs2/mkfs/main_jadd.c
+++ b/gfs2/mkfs/main_jadd.c
@@ -274,7 +274,7 @@ static void add_ir(struct jadd_opts *opts)
 	{
 		struct gfs2_inum_range ir;
 
-		set_flags(fd, JA_FL_SET, FS_JOURNAL_DATA_FL);
+		set_flags(fd, JA_FL_SET, FS_JOURNAL_DATA_FL|FS_RESERVED_FL);
 		memset(&ir, 0, sizeof(struct gfs2_inum_range));
 		if (write(fd, (void*)&ir, sizeof(struct gfs2_inum_range)) !=
 		    sizeof(struct gfs2_inum_range)) {
@@ -303,7 +303,7 @@ static void add_sc(struct jadd_opts *opts)
 
 	{
 		struct gfs2_statfs_change sc;
-		set_flags(fd, JA_FL_SET, FS_JOURNAL_DATA_FL);
+		set_flags(fd, JA_FL_SET, FS_JOURNAL_DATA_FL|FS_RESERVED_FL);
 
 		memset(&sc, 0, sizeof(struct gfs2_statfs_change));
 		if (write(fd, (void*)&sc, sizeof(struct gfs2_statfs_change)) !=
@@ -341,6 +341,7 @@ static void add_qc(struct gfs2_sbd *sdp, struct jadd_opts *opts)
 
 		dummy_bh.b_data = buf;
 		set_flags(fd, JA_FL_CLEAR, FS_JOURNAL_DATA_FL);
+		set_flags(fd, JA_FL_SET, FS_RESERVED_FL);
 		memset(buf, 0, sdp->bsize);
 
 		for (x=0; x<blocks; x++) {
@@ -436,6 +437,7 @@ static void add_j(struct gfs2_sbd *sdp, struct jadd_opts *opts)
 		uint64_t seq = RANDOM(blocks);
 
 		set_flags(fd, JA_FL_CLEAR, FS_JOURNAL_DATA_FL);
+		set_flags(fd, JA_FL_SET, FS_RESERVED_FL);
 		memset(buf, 0, sdp->bsize);
 		for (x=0; x<blocks; x++) {
 			if (write(fd, buf, sdp->bsize) != sdp->bsize) {
-- 
2.4.3