From: Andrew Price Date: Wed, 19 Jan 2022 10:43:06 +0000 Subject: [Cluster-devel] [PATCH 11/21] libgfs2: Namespace improvements - recovery.c In-Reply-To: <20220119104316.2489995-1-anprice@redhat.com> References: <20220119104316.2489995-1-anprice@redhat.com> Message-ID: <20220119104316.2489995-12-anprice@redhat.com> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Use the lgfs2_ prefix in libgfs2 interface names. Signed-off-by: Andrew Price --- gfs2/fsck/fs_recovery.c | 22 +++++++++++----------- gfs2/libgfs2/libgfs2.h | 4 ++-- gfs2/libgfs2/recovery.c | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c index 5bd46301..4a2d1259 100644 --- a/gfs2/fsck/fs_recovery.c +++ b/gfs2/fsck/fs_recovery.c @@ -135,9 +135,9 @@ static int buf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA) return 0; - gfs2_replay_incr_blk(ip, &start); + lgfs2_replay_incr_blk(ip, &start); - for (; blks; gfs2_replay_incr_blk(ip, &start), blks--) { + for (; blks; lgfs2_replay_incr_blk(ip, &start), blks--) { struct gfs2_meta_header *mhp; sd_found_metablocks++; @@ -147,7 +147,7 @@ static int buf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, if (revoke_check(sdp, blkno, start)) continue; - error = gfs2_replay_read_block(ip, start, &bh_log); + error = lgfs2_replay_read_block(ip, start, &bh_log); if (error) return error; @@ -200,8 +200,8 @@ static int revoke_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, offset = sizeof(struct gfs2_log_descriptor); - for (; blks; gfs2_replay_incr_blk(ip, &start), blks--) { - error = gfs2_replay_read_block(ip, start, &bh); + for (; blks; lgfs2_replay_incr_blk(ip, &start), blks--) { + error = lgfs2_replay_read_block(ip, start, &bh); if (error) return error; @@ -246,8 +246,8 @@ static int databuf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA) return 0; - gfs2_replay_incr_blk(ip, &start); - for (; blks; gfs2_replay_incr_blk(ip, &start), blks--) { + lgfs2_replay_incr_blk(ip, &start); + for (; blks; lgfs2_replay_incr_blk(ip, &start), blks--) { blkno = be64_to_cpu(*ptr); ptr++; esc = be64_to_cpu(*ptr); @@ -258,7 +258,7 @@ static int databuf_lo_scan_elements(struct gfs2_inode *ip, unsigned int start, if (revoke_check(sdp, blkno, start)) continue; - error = gfs2_replay_read_block(ip, start, &bh_log); + error = lgfs2_replay_read_block(ip, start, &bh_log); if (error) return error; @@ -313,7 +313,7 @@ static int foreach_descriptor(struct gfs2_inode *ip, unsigned int start, while (start != end) { struct gfs2_meta_header *mhp; - error = gfs2_replay_read_block(ip, start, &bh); + error = lgfs2_replay_read_block(ip, start, &bh); if (error) return error; mhp = (struct gfs2_meta_header *)bh->b_data; @@ -330,7 +330,7 @@ static int foreach_descriptor(struct gfs2_inode *ip, unsigned int start, error = lgfs2_get_log_header(ip, start, &lh); if (!error) { - gfs2_replay_incr_blk(ip, &start); + lgfs2_replay_incr_blk(ip, &start); lgfs2_bmodified(bh); lgfs2_brelse(bh); continue; @@ -369,7 +369,7 @@ static int foreach_descriptor(struct gfs2_inode *ip, unsigned int start, } while (length--) - gfs2_replay_incr_blk(ip, &start); + lgfs2_replay_incr_blk(ip, &start); lgfs2_bmodified(bh); lgfs2_brelse(bh); diff --git a/gfs2/libgfs2/libgfs2.h b/gfs2/libgfs2/libgfs2.h index e9e0c184..d091e180 100644 --- a/gfs2/libgfs2/libgfs2.h +++ b/gfs2/libgfs2/libgfs2.h @@ -730,8 +730,8 @@ extern int lgfs2_open_mnt_dev(const char *path, int flags, struct mntent **mnt); extern int lgfs2_open_mnt_dir(const char *path, int flags, struct mntent **mnt); /* recovery.c */ -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, +extern void lgfs2_replay_incr_blk(struct gfs2_inode *ip, unsigned int *blk); +extern int lgfs2_replay_read_block(struct gfs2_inode *ip, unsigned int blk, struct gfs2_buffer_head **bh); extern int lgfs2_get_log_header(struct gfs2_inode *ip, unsigned int blk, struct lgfs2_log_header *head); diff --git a/gfs2/libgfs2/recovery.c b/gfs2/libgfs2/recovery.c index 3984e1e3..483661e4 100644 --- a/gfs2/libgfs2/recovery.c +++ b/gfs2/libgfs2/recovery.c @@ -14,7 +14,7 @@ #include #include "libgfs2.h" -void gfs2_replay_incr_blk(struct gfs2_inode *ip, unsigned int *blk) +void lgfs2_replay_incr_blk(struct gfs2_inode *ip, unsigned int *blk) { uint32_t jd_blocks = ip->i_size / ip->i_sbd->sd_bsize; @@ -22,7 +22,7 @@ void gfs2_replay_incr_blk(struct gfs2_inode *ip, unsigned int *blk) *blk = 0; } -int gfs2_replay_read_block(struct gfs2_inode *ip, unsigned int blk, +int lgfs2_replay_read_block(struct gfs2_inode *ip, unsigned int blk, struct gfs2_buffer_head **bh) { int new = 0; @@ -77,7 +77,7 @@ int lgfs2_get_log_header(struct gfs2_inode *ip, unsigned int blk, uint32_t crc; int error; - error = gfs2_replay_read_block(ip, blk, &bh); + error = lgfs2_replay_read_block(ip, blk, &bh); if (error) return error; @@ -240,7 +240,7 @@ int lgfs2_clean_journal(struct gfs2_inode *ip, struct lgfs2_log_header *head) uint64_t dblock; lblock = head->lh_blkno; - gfs2_replay_incr_blk(ip, &lblock); + lgfs2_replay_incr_blk(ip, &lblock); lgfs2_block_map(ip, lblock, &new, &dblock, NULL, 0); if (!dblock) return -EIO; -- 2.34.1