This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch andyp-fsck_cx in repository gfs2-utils.
commit 05b2c7d3232565a41693aebdd3c80b31779a66ff Author: Andrew Price anprice@redhat.com AuthorDate: Mon Aug 1 11:30:59 2022 +0100
fsck.gfs2: Pass fsck_cx into handle_inconsist()
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/fsck/pass4.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c index 12afabbd..f63f4ff6 100644 --- a/gfs2/fsck/pass4.c +++ b/gfs2/fsck/pass4.c @@ -119,7 +119,7 @@ static int handle_unlinked(struct fsck_cx *cx, uint64_t no_addr, return 0; }
-static void handle_inconsist(struct lgfs2_sbd *sdp, uint64_t no_addr, +static void handle_inconsist(struct fsck_cx *cx, uint64_t no_addr, uint32_t *di_nlink, uint32_t counted_links) { log_err(_("Link count inconsistent for inode %"PRIu64" (0x%"PRIx64") has %u but fsck found %u.\n"), @@ -129,7 +129,7 @@ static void handle_inconsist(struct lgfs2_sbd *sdp, uint64_t no_addr, no_addr, no_addr)) { struct lgfs2_inode *ip;
- ip = fsck_load_inode(sdp, no_addr); /* lgfs2_bread, inode_get */ + ip = fsck_load_inode(cx->sdp, no_addr); /* lgfs2_bread, inode_get */ fix_link_count(counted_links, ip); *di_nlink = counted_links; fsck_inode_put(&ip); /* out, lgfs2_brelse, free */ @@ -187,7 +187,7 @@ static int scan_inode_list(struct fsck_cx *cx) continue; } /* if (ii->counted_links == 0) */ else if (ii->di_nlink != ii->counted_links) { - handle_inconsist(sdp, ii->num.in_addr, + handle_inconsist(cx, ii->num.in_addr, &ii->di_nlink, ii->counted_links); } log_debug(_("block %"PRIu64" (0x%"PRIx64") has link count %d\n"), @@ -220,7 +220,7 @@ static int scan_dir_list(struct fsck_cx *cx) &di->counted_links, &lf_addition)) continue; } else if (di->di_nlink != di->counted_links) { - handle_inconsist(sdp, di->dinode.in_addr, + handle_inconsist(cx, di->dinode.in_addr, &di->di_nlink, di->counted_links); } log_debug(_("block %"PRIu64" (0x%"PRIx64") has link count %d\n"),