[Cluster-devel] [PATCH 18/21] libgfs2: Namespace improvements - struct device

[Andrew Price]

Rename to struct lgfs2_device.

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

diff --git a/gfs2/fsck/rgrepair.c b/gfs2/fsck/rgrepair.c
index 5bfbb7da..b74eaa4a 100644
--- a/gfs2/fsck/rgrepair.c
+++ b/gfs2/fsck/rgrepair.c
@@ -696,7 +696,7 @@ out:
  *
  * Returns: the number of RGs
  */
-static uint64_t how_many_rgrps(struct lgfs2_sbd *sdp, struct device *dev)
+static uint64_t how_many_rgrps(struct lgfs2_sbd *sdp, struct lgfs2_device *dev)
 {
        uint64_t nrgrp;
        uint32_t rgblocks1, rgblocksn, bitblocks1, bitblocksn;
@@ -732,7 +732,7 @@ static uint64_t how_many_rgrps(struct lgfs2_sbd *sdp, 
struct device *dev)
  */
 static struct osi_root compute_rgrp_layout(struct lgfs2_sbd *sdp)
 {
-       struct device *dev;
+       struct lgfs2_device *dev;
        struct rgrp_tree *rl, *rlast = NULL;
        unsigned int rgrp = 0, nrgrp, rglength;
        struct osi_root rgtree = {NULL};
diff --git a/gfs2/libgfs2/device_geometry.c b/gfs2/libgfs2/device_geometry.c
index c6c00c95..1950d017 100644
--- a/gfs2/libgfs2/device_geometry.c
+++ b/gfs2/libgfs2/device_geometry.c
@@ -94,7 +94,7 @@ size_check:
 
 void lgfs2_fix_device_geometry(struct lgfs2_sbd *sdp)
 {
-       struct device *device = &sdp->device;
+       struct lgfs2_device *device = &sdp->device;
 
        device->length = sdp->dinfo.size / sdp->sd_bsize;
 }
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 3673182b..2fc831e4 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -156,7 +156,7 @@ struct lgfs2_dev_info {
        uint64_t size;
 };
 
-struct device {
+struct lgfs2_device {
        uint64_t length;
 };
 
@@ -361,7 +361,7 @@ struct lgfs2_sbd {
        int64_t sd_time;
 
        struct lgfs2_dev_info dinfo;
-       struct device device;
+       struct lgfs2_device device;
 
        int device_fd;
        int path_fd;
-- 
2.34.1