This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch main in repository gfs2-utils.
commit c9f68cc898cdf6bd8b86a6dd1b373ddbdc031b70 Author: Andrew Price anprice@redhat.com AuthorDate: Mon Jan 17 20:48:16 2022 +0000
libgfs2: Remove revoke function declarations from libgfs2.h
These functions are actually defined in fsck.gfs2 code and can be made static.
Signed-off-by: Andrew Price anprice@redhat.com --- gfs2/fsck/fs_recovery.c | 14 +++++++------- gfs2/libgfs2/libgfs2.h | 4 ---- 2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c index bd0fd731..5bd46301 100644 --- a/gfs2/fsck/fs_recovery.c +++ b/gfs2/fsck/fs_recovery.c @@ -33,7 +33,7 @@ struct gfs2_revoke_replay { unsigned int rr_where; };
-int gfs2_revoke_add(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) +static int revoke_add(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) { osi_list_t *tmp, *head = &sd_revoke_list; struct gfs2_revoke_replay *rr; @@ -62,7 +62,7 @@ int gfs2_revoke_add(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) return 1; }
-int gfs2_revoke_check(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) +static int revoke_check(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) { osi_list_t *tmp; struct gfs2_revoke_replay *rr; @@ -86,7 +86,7 @@ int gfs2_revoke_check(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where) return (wrap) ? (a || b) : (a && b); }
-void gfs2_revoke_clean(struct gfs2_sbd *sdp) +static void revoke_clean(struct gfs2_sbd *sdp) { osi_list_t *head = &sd_revoke_list; struct gfs2_revoke_replay *rr; @@ -144,7 +144,7 @@ static int buf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start,
blkno = be64_to_cpu(*ptr); ptr++; - if (gfs2_revoke_check(sdp, blkno, start)) + if (revoke_check(sdp, blkno, start)) continue;
error = gfs2_replay_read_block(ip, start, &bh_log); @@ -213,7 +213,7 @@ static int revoke_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, blkno = be64_to_cpu(*(__be64 *)(bh->b_data + offset)); log_info(_("Journal replay processing revoke for block #%"PRIu64" (0x%"PRIx64") for journal+0x%x\n"), blkno, blkno, start); - error = gfs2_revoke_add(sdp, blkno, start); + error = revoke_add(sdp, blkno, start); if (error < 0) return error; else if (error) @@ -255,7 +255,7 @@ static int databuf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start,
sd_found_jblocks++;
- if (gfs2_revoke_check(sdp, blkno, start)) + if (revoke_check(sdp, blkno, start)) continue;
error = gfs2_replay_read_block(ip, start, &bh_log); @@ -578,7 +578,7 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j, int preen, } } log_info( _("jid=%u: Found %u revoke tags\n"), j, sd_found_revokes); - gfs2_revoke_clean(sdp); + revoke_clean(sdp); error = lgfs2_clean_journal(ip, &head); if (error) goto out; diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index 5c2f1aa7..e9e0c184 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -733,10 +733,6 @@ extern int lgfs2_open_mnt_dir(const char *path, int flags, struct mntent **mnt); extern void gfs2_replay_incr_blk(struct gfs2_inode *ip, unsigned int *blk); extern int gfs2_replay_read_block(struct gfs2_inode *ip, unsigned int blk, struct gfs2_buffer_head **bh); -extern int gfs2_revoke_add(struct gfs2_sbd *sdp, uint64_t blkno, unsigned int where); -extern int gfs2_revoke_check(struct gfs2_sbd *sdp, uint64_t blkno, - unsigned int where); -extern void gfs2_revoke_clean(struct gfs2_sbd *sdp); extern int lgfs2_get_log_header(struct gfs2_inode *ip, unsigned int blk, struct lgfs2_log_header *head); extern int lgfs2_find_jhead(struct gfs2_inode *ip, struct lgfs2_log_header *head);