[Cluster-devel] [PATCH 12/21] libgfs2: Namespace improvements - device_geometry.c

[Andrew Price]

Use the lgfs2_ prefix in libgfs2 interface names.

Signed-off-by: Andrew Price <anpr...@redhat.com>
---
 gfs2/edit/hexedit.c            | 2 +-
 gfs2/fsck/rgrepair.c           | 2 +-
 gfs2/libgfs2/device_geometry.c | 2 +-
 gfs2/libgfs2/gfs2l.c           | 2 +-
 gfs2/libgfs2/libgfs2.h         | 2 +-
 gfs2/mkfs/main_grow.c          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
index fc1b5f4f..3415b41f 100644
--- a/gfs2/edit/hexedit.c
+++ b/gfs2/edit/hexedit.c
@@ -909,7 +909,7 @@ static void read_superblock(int fd)
        else {
                block = starting_blk = 0;
        }
-       fix_device_geometry(&sbd);
+       lgfs2_fix_device_geometry(&sbd);
        if(sbd.gfs1) {
                sbd.sd_inptrs = (sbd.sd_bsize - sizeof(struct gfs_indirect)) /
                        sizeof(uint64_t);
diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 333a77a5..37d20aed 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -818,7 +818,7 @@ static int gfs2_rindex_calculate(struct gfs2_sbd *sdp, int 
*num_rgs)
        *num_rgs = sdp->md.riinode->i_size / sizeof(struct gfs2_rindex);
 
        rgcalc.osi_node = NULL;
-       fix_device_geometry(sdp);
+       lgfs2_fix_device_geometry(sdp);
 
        /* Try all possible rgrp sizes: 2048, 1024, 512, 256, 128, 64, 32 */
        for (sdp->rgsize = GFS2_DEFAULT_RGSIZE; sdp->rgsize >= 32;
diff --git a/gfs2/libgfs2/device_geometry.c b/gfs2/libgfs2/device_geometry.c
index cb1ed6d5..86ad84bd 100644
--- a/gfs2/libgfs2/device_geometry.c
+++ b/gfs2/libgfs2/device_geometry.c
@@ -92,7 +92,7 @@ size_check:
  *
  */
 
-void fix_device_geometry(struct gfs2_sbd *sdp)
+void lgfs2_fix_device_geometry(struct gfs2_sbd *sdp)
 {
        struct device *device = &sdp->device;
 
diff --git a/gfs2/libgfs2/gfs2l.c b/gfs2/libgfs2/gfs2l.c
index a247bed2..b8c4ca41 100644
--- a/gfs2/libgfs2/gfs2l.c
+++ b/gfs2/libgfs2/gfs2l.c
@@ -130,7 +130,7 @@ static int openfs(const char *path, struct gfs2_sbd *sdp)
                perror("Failed to gather device info");
                return 1;
        }
-       fix_device_geometry(sdp);
+       lgfs2_fix_device_geometry(sdp);
 
        ret = lgfs2_read_sb(sdp);
        if (ret != 0) {
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index d091e180..39097e68 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -473,7 +473,7 @@ extern uint32_t lgfs2_get_block_type(const char *buf);
 
 /* device_geometry.c */
 extern int lgfs2_get_dev_info(int fd, struct lgfs2_dev_info *i);
-extern void fix_device_geometry(struct gfs2_sbd *sdp);
+extern void lgfs2_fix_device_geometry(struct gfs2_sbd *sdp);
 
 /* fs_bits.c */
 #define BFITNOENT (0xFFFFFFFF)
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
index 298ba2a6..b2959285 100644
--- a/gfs2/mkfs/main_grow.c
+++ b/gfs2/mkfs/main_grow.c
@@ -406,7 +406,7 @@ int main(int argc, char *argv[])
                        fprintf(stderr, _("cannot grow gfs1 filesystem\n"));
                        exit(EXIT_FAILURE);
                }
-               fix_device_geometry(sdp);
+               lgfs2_fix_device_geometry(sdp);
                mfs.context = copy_context_opt(mnt);
                if (mount_gfs2_meta(&mfs, mnt->mnt_dir, (print_level > 
MSG_NOTICE))) {
                        perror(_("Failed to mount GFS2 meta file system"));
-- 
2.34.1