This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch master
in repository gfs2-utils.
The following commit(s) were added to refs/heads/master by this push:
new fda789ce fsck.gfs2: Fix declaration mismatch for invalidate_*
fda789ce is described below
commit fda789cef3097fd779e25b2236fa7c86646a0a04
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Tue Apr 27 11:04:57 2021 +0100
fsck.gfs2: Fix declaration mismatch for invalidate_*
Move the invalidate_fxns struct definition down so that the forward
declarations for those functions can be removed to avoid mismatches.
Fixes sparse error:
pass1.c:1146:12: error: symbol 'invalidate_data' redeclared with
different type (incompatible argument 6 (different base types))
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/pass1.c | 34 ++++++++++------------------------
1 file changed, 10 insertions(+), 24 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 71d6a46d..0cd9b274 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -68,20 +68,6 @@ static int check_extended_leaf_eattr(struct gfs2_inode *ip, int i,
void *private);
static int finish_eattr_indir(struct gfs2_inode *ip, int leaf_pointers,
int leaf_pointer_errors, void *private);
-static int invalidate_metadata(struct iptr iptr, struct gfs2_buffer_head **bh, int h,
- int *is_valid, int *was_duplicate, void *private);
-static int invalidate_leaf(struct gfs2_inode *ip, uint64_t block,
- void *private);
-static int invalidate_data(struct gfs2_inode *ip, uint64_t metablock,
- uint64_t block, void *private,
- struct gfs2_buffer_head *bh, uint64_t *ptr);
-static int invalidate_eattr_indir(struct gfs2_inode *ip, uint64_t block,
- uint64_t parent,
- struct gfs2_buffer_head **bh,
- void *private);
-static int invalidate_eattr_leaf(struct gfs2_inode *ip, uint64_t block,
- uint64_t parent, struct gfs2_buffer_head **bh,
- void *private);
static int handle_ip(struct gfs2_sbd *sdp, struct gfs2_inode *ip);
static int delete_block(struct gfs2_inode *ip, uint64_t block,
struct gfs2_buffer_head **bh, const char *btype,
@@ -202,16 +188,6 @@ struct metawalk_fxns pass1_fxns = {
.delete_block = delete_block,
};
-struct metawalk_fxns invalidate_fxns = {
- .private = NULL,
- .check_metalist = invalidate_metadata,
- .check_data = invalidate_data,
- .check_leaf = invalidate_leaf,
- .check_eattr_indir = invalidate_eattr_indir,
- .check_eattr_leaf = invalidate_eattr_leaf,
- .delete_block = delete_block,
-};
-
/*
* resuscitate_metalist - make sure a system directory entry's metadata blocks
* are marked "in use" in the bitmap.
@@ -1169,6 +1145,16 @@ static int invalidate_eattr_leaf(struct gfs2_inode *ip, uint64_t
block,
NULL, NULL);
}
+struct metawalk_fxns invalidate_fxns = {
+ .private = NULL,
+ .check_metalist = invalidate_metadata,
+ .check_data = invalidate_data,
+ .check_leaf = invalidate_leaf,
+ .check_eattr_indir = invalidate_eattr_indir,
+ .check_eattr_leaf = invalidate_eattr_leaf,
+ .delete_block = delete_block,
+};
+
/**
* Check for massive amounts of pointer corruption. If the block has
* lots of out-of-range pointers, we can't trust any of the pointers.
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.