This is an automated email from the git hooks/post-receive script.
andyp pushed a commit to branch main
in repository gfs2-utils.
commit 3879549dc022da9bb026dce4ca8fbf3400f9c800
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Thu Jan 6 15:41:37 2022 +0000
fsck.gfs2: Rename warm_fuzzy_stuff()
Descriptive function names give me the warm fuzzies.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
gfs2/fsck/pass1.c | 2 +-
gfs2/fsck/pass1b.c | 2 +-
gfs2/fsck/pass2.c | 2 +-
gfs2/fsck/pass5.c | 2 +-
gfs2/fsck/util.c | 4 +---
gfs2/fsck/util.h | 2 +-
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/gfs2/fsck/pass1.c b/gfs2/fsck/pass1.c
index 724a8237..e976149c 100644
--- a/gfs2/fsck/pass1.c
+++ b/gfs2/fsck/pass1.c
@@ -1702,7 +1702,7 @@ static int pass1_process_bitmap(struct gfs2_sbd *sdp, struct
rgrp_tree *rgd, uin
block, block);
continue;
}
- warm_fuzzy_stuff(block);
+ display_progress(block);
if (fsck_abort) { /* if asked to abort */
gfs2_special_free(&gfs1_rindex_blks);
diff --git a/gfs2/fsck/pass1b.c b/gfs2/fsck/pass1b.c
index 16bec798..5b37478d 100644
--- a/gfs2/fsck/pass1b.c
+++ b/gfs2/fsck/pass1b.c
@@ -898,7 +898,7 @@ int pass1b(struct gfs2_sbd *sdp)
return FSCK_ERROR;
}
- warm_fuzzy_stuff(i);
+ display_progress(i);
if (find_block_ref(sdp, i) < 0) {
stack;
rc = FSCK_ERROR;
diff --git a/gfs2/fsck/pass2.c b/gfs2/fsck/pass2.c
index 8075773c..998b0c96 100644
--- a/gfs2/fsck/pass2.c
+++ b/gfs2/fsck/pass2.c
@@ -2118,7 +2118,7 @@ int pass2(struct gfs2_sbd *sdp)
dt = (struct dir_info *)tmp;
dirblk = dt->dinode.in_addr;
- warm_fuzzy_stuff(dirblk);
+ display_progress(dirblk);
if (skip_this_pass || fsck_abort) /* if asked to skip the rest */
return FSCK_OK;
diff --git a/gfs2/fsck/pass5.c b/gfs2/fsck/pass5.c
index 6dd3276b..9730aa06 100644
--- a/gfs2/fsck/pass5.c
+++ b/gfs2/fsck/pass5.c
@@ -33,7 +33,7 @@ static int check_block_status(struct gfs2_sbd *sdp, struct gfs2_bmap
*bl,
while (byte < end) {
rg_status = ((*byte >> bit) & GFS2_BIT_MASK);
block = rg_data + *rg_block;
- warm_fuzzy_stuff(block);
+ display_progress(block);
if (skip_this_pass || fsck_abort) /* if asked to skip the rest */
return 0;
diff --git a/gfs2/fsck/util.c b/gfs2/fsck/util.c
index 382acb52..f4d137ed 100644
--- a/gfs2/fsck/util.c
+++ b/gfs2/fsck/util.c
@@ -56,9 +56,7 @@ void big_file_comfort(struct gfs2_inode *ip, uint64_t blks_checked)
fflush(stdout);
}
-/* Put out a warm, fuzzy message every second so the user */
-/* doesn't think we hung. (This may take a long time). */
-void warm_fuzzy_stuff(uint64_t block)
+void display_progress(uint64_t block)
{
static uint64_t one_percent = 0;
static struct timeval tv;
diff --git a/gfs2/fsck/util.h b/gfs2/fsck/util.h
index 88b6aa35..7b0519a5 100644
--- a/gfs2/fsck/util.h
+++ b/gfs2/fsck/util.h
@@ -14,7 +14,7 @@
struct di_info *search_list(osi_list_t *list, uint64_t addr);
void big_file_comfort(struct gfs2_inode *ip, uint64_t blks_checked);
-void warm_fuzzy_stuff(uint64_t block);
+void display_progress(uint64_t block);
int add_duplicate_ref(struct gfs2_inode *ip, uint64_t block,
enum dup_ref_type reftype, int first, int inode_valid);
extern struct inode_with_dups *find_dup_ref_inode(struct duptree *dt,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
Show replies by date