* [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr
@ 2012-04-30 17:29 Andrew Price
2012-04-30 17:29 ` [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings Andrew Price
2012-05-01 9:22 ` [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Steven Whitehouse
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Price @ 2012-04-30 17:29 UTC (permalink / raw)
To: cluster-devel.redhat.com
gfs2_get_leaf_nr and gfs_get_leaf_nr are identical so we can remove
gfs_get_leaf_nr.
Signed-off-by: Andrew Price <anprice@redhat.com>
---
gfs2/libgfs2/fs_ops.c | 2 --
gfs2/libgfs2/gfs1.c | 16 ----------------
gfs2/libgfs2/libgfs2.h | 2 --
3 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c
index a72394f..470916c 100644
--- a/gfs2/libgfs2/fs_ops.c
+++ b/gfs2/libgfs2/fs_ops.c
@@ -851,8 +851,6 @@ void gfs2_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
uint64_t leaf_no;
int count;
- if (dip->i_sbd->gfs1)
- return gfs_get_leaf_nr(dip, lindex, leaf_out);
count = gfs2_readi(dip, (char *)&leaf_no, lindex * sizeof(uint64_t),
sizeof(uint64_t));
if (count != sizeof(uint64_t)) {
diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c
index 8e3fc93..d6f8794 100644
--- a/gfs2/libgfs2/gfs1.c
+++ b/gfs2/libgfs2/gfs1.c
@@ -395,22 +395,6 @@ void gfs_rgrp_out(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh)
bmodified(rbh);
}
-void gfs_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
- uint64_t *leaf_out)
-{
- uint64_t leaf_no;
- int count;
-
- count = gfs2_readi(dip, (char *)&leaf_no, lindex * sizeof(uint64_t),
- sizeof(uint64_t));
- if (count != sizeof(uint64_t)) {
- fprintf(stderr, "gfs_get_leaf_nr: Bad internal read.\n");
- exit(1);
- }
-
- *leaf_out = be64_to_cpu(leaf_no);
-}
-
void gfs_put_leaf_nr(struct gfs2_inode *dip, uint32_t inx, uint64_t leaf_out)
{
uint64_t leaf_no;
diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
index 4bd01a8..e2a7e45 100644
--- a/gfs2/libgfs2/libgfs2.h
+++ b/gfs2/libgfs2/libgfs2.h
@@ -660,8 +660,6 @@ extern struct gfs2_inode *gfs_inode_read(struct gfs2_sbd *sdp,
extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf);
extern void gfs_rgrp_in(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
extern void gfs_rgrp_out(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
-extern void gfs_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
- uint64_t *leaf_out);
extern void gfs_put_leaf_nr(struct gfs2_inode *dip, uint32_t inx,
uint64_t leaf_out);
--
1.7.7.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings
2012-04-30 17:29 [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Andrew Price
@ 2012-04-30 17:29 ` Andrew Price
2012-05-01 9:23 ` Steven Whitehouse
2012-05-01 9:22 ` [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Steven Whitehouse
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Price @ 2012-04-30 17:29 UTC (permalink / raw)
To: cluster-devel.redhat.com
Fixes these warnings:
fs_geometry.c:80:47: warning: variable 'rlast2' set but not used
[-Wunused-but-set-variable]
meta.c:732:3: warning: large integer implicitly truncated to unsigned
type [-Woverflow]
Signed-off-by: Andrew Price <anprice@redhat.com>
---
gfs2/libgfs2/fs_geometry.c | 3 +--
gfs2/libgfs2/meta.c | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c
index fb55697..e248f7c 100644
--- a/gfs2/libgfs2/fs_geometry.c
+++ b/gfs2/libgfs2/fs_geometry.c
@@ -77,7 +77,7 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
int rgsize_specified)
{
struct device *dev;
- struct rgrp_tree *rl, *rlast = NULL, *rlast2 = NULL;
+ struct rgrp_tree *rl, *rlast = NULL;
struct osi_node *n, *next = NULL;
unsigned int rgrp = 0, nrgrp, rglength;
uint64_t rgaddr;
@@ -105,7 +105,6 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
PRIx64 "), length = %"PRIu64" (0x%"
PRIx64 ")\n", rgrp + 1, rl->start, rl->start,
rl->length, rl->length);
- rlast2 = rlast;
rlast = rl;
}
rlast->start = rlast->ri.ri_addr;
diff --git a/gfs2/libgfs2/meta.c b/gfs2/libgfs2/meta.c
index 87f8f31..1f796c8 100644
--- a/gfs2/libgfs2/meta.c
+++ b/gfs2/libgfs2/meta.c
@@ -729,7 +729,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
},
[LGFS2_MT_FREE] = {
.gfs1 = 1,
- .gfs2 = 2,
+ .gfs2 = 1,
.name = "free",
},
};
--
1.7.7.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr
2012-04-30 17:29 [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Andrew Price
2012-04-30 17:29 ` [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings Andrew Price
@ 2012-05-01 9:22 ` Steven Whitehouse
1 sibling, 0 replies; 4+ messages in thread
From: Steven Whitehouse @ 2012-05-01 9:22 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
Looks good to me,
Steve.
On Mon, 2012-04-30 at 18:29 +0100, Andrew Price wrote:
> gfs2_get_leaf_nr and gfs_get_leaf_nr are identical so we can remove
> gfs_get_leaf_nr.
>
> Signed-off-by: Andrew Price <anprice@redhat.com>
> ---
> gfs2/libgfs2/fs_ops.c | 2 --
> gfs2/libgfs2/gfs1.c | 16 ----------------
> gfs2/libgfs2/libgfs2.h | 2 --
> 3 files changed, 0 insertions(+), 20 deletions(-)
>
> diff --git a/gfs2/libgfs2/fs_ops.c b/gfs2/libgfs2/fs_ops.c
> index a72394f..470916c 100644
> --- a/gfs2/libgfs2/fs_ops.c
> +++ b/gfs2/libgfs2/fs_ops.c
> @@ -851,8 +851,6 @@ void gfs2_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
> uint64_t leaf_no;
> int count;
>
> - if (dip->i_sbd->gfs1)
> - return gfs_get_leaf_nr(dip, lindex, leaf_out);
> count = gfs2_readi(dip, (char *)&leaf_no, lindex * sizeof(uint64_t),
> sizeof(uint64_t));
> if (count != sizeof(uint64_t)) {
> diff --git a/gfs2/libgfs2/gfs1.c b/gfs2/libgfs2/gfs1.c
> index 8e3fc93..d6f8794 100644
> --- a/gfs2/libgfs2/gfs1.c
> +++ b/gfs2/libgfs2/gfs1.c
> @@ -395,22 +395,6 @@ void gfs_rgrp_out(struct gfs_rgrp *rgrp, struct gfs2_buffer_head *rbh)
> bmodified(rbh);
> }
>
> -void gfs_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
> - uint64_t *leaf_out)
> -{
> - uint64_t leaf_no;
> - int count;
> -
> - count = gfs2_readi(dip, (char *)&leaf_no, lindex * sizeof(uint64_t),
> - sizeof(uint64_t));
> - if (count != sizeof(uint64_t)) {
> - fprintf(stderr, "gfs_get_leaf_nr: Bad internal read.\n");
> - exit(1);
> - }
> -
> - *leaf_out = be64_to_cpu(leaf_no);
> -}
> -
> void gfs_put_leaf_nr(struct gfs2_inode *dip, uint32_t inx, uint64_t leaf_out)
> {
> uint64_t leaf_no;
> diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h
> index 4bd01a8..e2a7e45 100644
> --- a/gfs2/libgfs2/libgfs2.h
> +++ b/gfs2/libgfs2/libgfs2.h
> @@ -660,8 +660,6 @@ extern struct gfs2_inode *gfs_inode_read(struct gfs2_sbd *sdp,
> extern void gfs_jindex_in(struct gfs_jindex *jindex, char *buf);
> extern void gfs_rgrp_in(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
> extern void gfs_rgrp_out(struct gfs_rgrp *rg, struct gfs2_buffer_head *bh);
> -extern void gfs_get_leaf_nr(struct gfs2_inode *dip, uint32_t lindex,
> - uint64_t *leaf_out);
> extern void gfs_put_leaf_nr(struct gfs2_inode *dip, uint32_t inx,
> uint64_t leaf_out);
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings
2012-04-30 17:29 ` [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings Andrew Price
@ 2012-05-01 9:23 ` Steven Whitehouse
0 siblings, 0 replies; 4+ messages in thread
From: Steven Whitehouse @ 2012-05-01 9:23 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
Looks good,
Steve.
On Mon, 2012-04-30 at 18:29 +0100, Andrew Price wrote:
> Fixes these warnings:
> fs_geometry.c:80:47: warning: variable 'rlast2' set but not used
> [-Wunused-but-set-variable]
> meta.c:732:3: warning: large integer implicitly truncated to unsigned
> type [-Woverflow]
>
> Signed-off-by: Andrew Price <anprice@redhat.com>
> ---
> gfs2/libgfs2/fs_geometry.c | 3 +--
> gfs2/libgfs2/meta.c | 2 +-
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/gfs2/libgfs2/fs_geometry.c b/gfs2/libgfs2/fs_geometry.c
> index fb55697..e248f7c 100644
> --- a/gfs2/libgfs2/fs_geometry.c
> +++ b/gfs2/libgfs2/fs_geometry.c
> @@ -77,7 +77,7 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
> int rgsize_specified)
> {
> struct device *dev;
> - struct rgrp_tree *rl, *rlast = NULL, *rlast2 = NULL;
> + struct rgrp_tree *rl, *rlast = NULL;
> struct osi_node *n, *next = NULL;
> unsigned int rgrp = 0, nrgrp, rglength;
> uint64_t rgaddr;
> @@ -105,7 +105,6 @@ void compute_rgrp_layout(struct gfs2_sbd *sdp, struct osi_root *rgtree,
> PRIx64 "), length = %"PRIu64" (0x%"
> PRIx64 ")\n", rgrp + 1, rl->start, rl->start,
> rl->length, rl->length);
> - rlast2 = rlast;
> rlast = rl;
> }
> rlast->start = rlast->ri.ri_addr;
> diff --git a/gfs2/libgfs2/meta.c b/gfs2/libgfs2/meta.c
> index 87f8f31..1f796c8 100644
> --- a/gfs2/libgfs2/meta.c
> +++ b/gfs2/libgfs2/meta.c
> @@ -729,7 +729,7 @@ const struct lgfs2_metadata lgfs2_metadata[] = {
> },
> [LGFS2_MT_FREE] = {
> .gfs1 = 1,
> - .gfs2 = 2,
> + .gfs2 = 1,
> .name = "free",
> },
> };
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-05-01 9:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-30 17:29 [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Andrew Price
2012-04-30 17:29 ` [Cluster-devel] [PATCH 2/2] libgfs2: Clean up some warnings Andrew Price
2012-05-01 9:23 ` Steven Whitehouse
2012-05-01 9:22 ` [Cluster-devel] [PATCH 1/2] libgfs2: Remove gfs_get_leaf_nr Steven Whitehouse
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).