This is an automated email from the git hooks/post-receive script.
agruenba pushed a commit to branch agruenba-extents
in repository gfs2-utils.
commit 53133be87e7b003774c5d31cd803f7ee07d8b9e7
Author: Andreas Gruenbacher <agruenba(a)redhat.com>
AuthorDate: Thu Apr 22 15:38:11 2021 +0200
fsck.gfs2: Fix some endianness annotations
Signed-off-by: Andreas Gruenbacher <agruenba(a)redhat.com>
---
gfs2/fsck/afterpass1_common.c | 2 +-
gfs2/fsck/afterpass1_common.h | 2 +-
gfs2/fsck/fs_recovery.c | 2 +-
gfs2/fsck/metawalk.c | 14 ++++++++------
gfs2/fsck/metawalk.h | 2 +-
gfs2/fsck/pass1.c | 10 +++++-----
gfs2/fsck/pass1b.c | 6 +++---
gfs2/fsck/pass2.c | 2 +-
8 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/gfs2/fsck/afterpass1_common.c b/gfs2/fsck/afterpass1_common.c
index 55a6c76b..646e4010 100644
--- a/gfs2/fsck/afterpass1_common.c
+++ b/gfs2/fsck/afterpass1_common.c
@@ -195,7 +195,7 @@ int delete_leaf(struct gfs2_inode *ip, uint64_t block, void *private)
int delete_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private, struct gfs2_buffer_head *bh,
- uint64_t *ptr)
+ __be64 *ptr)
{
return delete_block_if_notdup(ip, block, NULL, _("data"), NULL,
private);
diff --git a/gfs2/fsck/afterpass1_common.h b/gfs2/fsck/afterpass1_common.h
index 74b913f3..e12ed96e 100644
--- a/gfs2/fsck/afterpass1_common.h
+++ b/gfs2/fsck/afterpass1_common.h
@@ -9,7 +9,7 @@ extern int delete_metadata(struct iptr iptr, struct gfs2_buffer_head **bh,
int h
extern int delete_leaf(struct gfs2_inode *ip, uint64_t block, void *private);
extern int delete_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr);
+ struct gfs2_buffer_head *bh, __be64 *ptr);
extern int delete_eattr_indir(struct gfs2_inode *ip, uint64_t block, uint64_t parent,
struct gfs2_buffer_head **bh, void *private);
extern int delete_eattr_leaf(struct gfs2_inode *ip, uint64_t block, uint64_t parent,
diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c
index 820df1d0..7bfddbfd 100644
--- a/gfs2/fsck/fs_recovery.c
+++ b/gfs2/fsck/fs_recovery.c
@@ -666,7 +666,7 @@ static int rangecheck_jmeta(struct iptr iptr, struct gfs2_buffer_head
**bh, int
static int rangecheck_jdata(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
return rangecheck_jblock(ip, block);
}
diff --git a/gfs2/fsck/metawalk.c b/gfs2/fsck/metawalk.c
index 1b5272ff..acff5457 100644
--- a/gfs2/fsck/metawalk.c
+++ b/gfs2/fsck/metawalk.c
@@ -1406,9 +1406,10 @@ static int metawalk_check_data(struct gfs2_inode *ip, struct
metawalk_fxns *pass
uint64_t *blks_checked, struct error_block *error_blk)
{
int error = 0, rc = 0;
- uint64_t block, *ptr;
- uint64_t *ptr_start = (uint64_t *)(bh->b_data + hdr_size(bh, height));
- uint64_t *ptr_end = (uint64_t *)(bh->b_data + ip->i_sbd->bsize);
+ uint64_t block;
+ __be64 *ptr_start = (uint64_t *)(bh->b_data + hdr_size(bh, height));
+ __be64 *ptr_end = (uint64_t *)(bh->b_data + ip->i_sbd->bsize);
+ __be64 *ptr;
uint64_t metablock = bh->b_blocknr;
/* If there isn't much pointer corruption check the pointers */
@@ -1478,11 +1479,12 @@ static int undo_check_data(struct gfs2_inode *ip, struct
metawalk_fxns *pass,
struct gfs2_buffer_head *bh, unsigned int height,
struct error_block *error_blk, int error)
{
- uint64_t *ptr_start = (uint64_t *)(bh->b_data + hdr_size(bh, height));
- uint64_t *ptr_end = (uint64_t *)(bh->b_data + ip->i_sbd->bsize);
+ __be64 *ptr_start = (uint64_t *)(bh->b_data + hdr_size(bh, height));
+ __be64 *ptr_end = (uint64_t *)(bh->b_data + ip->i_sbd->bsize);
+ __be64 *ptr;
uint64_t metablock = bh->b_blocknr;
int rc = 0;
- uint64_t block, *ptr;
+ uint64_t block;
int found_error_blk = 0;
/* If there isn't much pointer corruption check the pointers */
diff --git a/gfs2/fsck/metawalk.h b/gfs2/fsck/metawalk.h
index 592479df..88c7d9c1 100644
--- a/gfs2/fsck/metawalk.h
+++ b/gfs2/fsck/metawalk.h
@@ -96,7 +96,7 @@ struct metawalk_fxns {
void *private);
int (*check_data) (struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr);
+ struct gfs2_buffer_head *bh, __be64 *ptr);
int (*check_eattr_indir) (struct gfs2_inode *ip, uint64_t block,
uint64_t parent,
struct gfs2_buffer_head **bh, void *private);
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 70549a3a..27a7d6dc 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -45,7 +45,7 @@ static int undo_check_metalist(struct gfs2_inode *ip, uint64_t block,
int h, void *private);
static int pass1_check_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr);
+ struct gfs2_buffer_head *bh, __be64 *ptr);
static int undo_check_data(struct gfs2_inode *ip, uint64_t block,
void *private);
static int check_eattr_indir(struct gfs2_inode *ip, uint64_t indirect,
@@ -549,7 +549,7 @@ out:
static int pass1_check_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bbh, uint64_t *ptr)
+ struct gfs2_buffer_head *bbh, __be64 *ptr)
{
int q;
struct block_count *bc = (struct block_count *) private;
@@ -1145,7 +1145,7 @@ static int invalidate_leaf(struct gfs2_inode *ip, uint64_t block,
static int invalidate_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
return mark_block_invalid(ip, block, ref_as_data, _("data"),
NULL, NULL);
@@ -1247,7 +1247,7 @@ static int rangecheck_leaf(struct gfs2_inode *ip, uint64_t block,
static int rangecheck_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
return rangecheck_block(ip, block, NULL, btype_data, private);
}
@@ -1360,7 +1360,7 @@ static int alloc_metalist(struct iptr iptr, struct gfs2_buffer_head
**bh, int h,
static int alloc_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
int q;
const char *desc = (const char *)private;
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index 91d7fa53..ae5a2c49 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -79,7 +79,7 @@ static int findref_meta(struct iptr iptr, struct gfs2_buffer_head **bh,
int h,
static int findref_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
struct meta_blk_ref *mbr = (struct meta_blk_ref *)private;
@@ -411,7 +411,7 @@ static int clone_check_meta(struct iptr iptr, struct gfs2_buffer_head
**bh, int
*/
static int clone_data(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
struct clone_target *clonet = (struct clone_target *)private;
struct gfs2_buffer_head *clone_bh;
@@ -802,7 +802,7 @@ static int check_metalist_refs(struct iptr iptr, struct
gfs2_buffer_head **bh, i
static int check_data_refs(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr)
+ struct gfs2_buffer_head *bh, __be64 *ptr)
{
return add_duplicate_ref(ip, block, ref_as_data, 1, INODE_VALID);
}
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
index b6a047c3..9184bbc6 100644
--- a/gfs2/fsck/pass2.c
+++ b/gfs2/fsck/pass2.c
@@ -1887,7 +1887,7 @@ static int check_metalist_qc(struct iptr iptr, struct
gfs2_buffer_head **bh, int
static int check_data_qc(struct gfs2_inode *ip, uint64_t metablock,
uint64_t block, void *private,
- struct gfs2_buffer_head *bbh, uint64_t *ptr)
+ struct gfs2_buffer_head *bbh, __be64 *ptr)
{
struct gfs2_buffer_head *bh;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.