[Cluster-devel] [PATCH 17/21] libgfs2: Namespace improvements - struct master_dir

[Andrew Price]

Rename to struct lgfs2_meta_dir.

Signed-off-by: Andrew Price <anpr...@redhat.com>
---
 gfs2/fsck/initialize.c | 2 +-
 gfs2/libgfs2/libgfs2.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c
index 2bde52ab..ec9a8eef 100644
--- a/gfs2/fsck/initialize.c
+++ b/gfs2/fsck/initialize.c
@@ -32,7 +32,7 @@
 
 static int was_mounted_ro = 0;
 static uint64_t possible_root = HIGHEST_BLOCK;
-static struct master_dir fix_md;
+static struct lgfs2_meta_dir fix_md;
 static uint64_t blks_2free = 0;
 
 /**
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 00deb455..3673182b 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -300,7 +300,7 @@ struct lgfs2_inode {
        };
 };
 
-struct master_dir
+struct lgfs2_meta_dir
 {
        struct lgfs2_inode *inum;
        uint64_t next_inum;
@@ -375,7 +375,7 @@ struct lgfs2_sbd {
        struct osi_root rgtree;
 
        struct lgfs2_inode *master_dir;
-       struct master_dir md;
+       struct lgfs2_meta_dir md;
 
        unsigned int gfs1:1;
 };
-- 
2.34.1