Skip to contentSkip to conversation

btrfs-progs: check: Fix false alert about uninitialized

PATCH Applied Qu Wenruo 2 participants 2 messages Feb 27, 2019 – Mar 1, 2019 Btrfs file system

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

PATCH 1/1 btrfs-progs: check: Fix false alert about uninitialized

GCC 8.2.1 will report the following error:

check/main.c: In function 'try_repair_inode':
check/main.c:2606:5: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]

    if (!ret) {
       ^
  check/main.c:2584:6: note: 'ret' was declared here
    int ret;
        ^~~

The offending code is in repair_mismatch_dir_hash():

	int ret;

	printf(
	"Deleting bad dir items with invalid hash for root %llu ino %llu\n",
		root->root_key.objectid, rec->ino);
	while (!list_empty(&rec->mismatch_dir_hash)) {
		/* do some repair */
	}
	if (!ret) { <<< Here
		/* do some fix */
	}

The truth is, to enter try_repair_inode(), we must have I_ERR_MISMATCH_DIR_HASH bit set for rec->errors.

And just after we set I_ERR_MISMATCH_DIR_HASH, we call add_mismatch_dir_hash() and handled its error correctly.

So it's impossible to to skip the while loop.

Fix it by initializing @ret to -EUCLEAN, so even we hit some impossible case, repair_mismatch_dir_hash() won't falsely consider the mismatch hash fixed.

---
 check/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
check/main.c +1 -1
index 951a23b1e26a..ea078e023d24 100644
@@ -2581,7 +2581,7 @@ static int repair_mismatch_dir_hash(struct btrfs_trans_handle *trans,
 				    struct inode_record *rec)
 {
 	struct mismatch_dir_hash_record *hash;
-	int ret;
+	int ret = -EUCLEAN;
 
 	printf(
 	"Deleting bad dir items with invalid hash for root %llu ino %llu\n",
Signature · 1 line
2.21.0
Applied
#1 lore raw
Quoted 30 lines · Qu Wenruo

GCC 8.2.1 will report the following error:

check/main.c: In function 'try_repair_inode':
check/main.c:2606:5: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]

    if (!ret) {
       ^
  check/main.c:2584:6: note: 'ret' was declared here
    int ret;
        ^~~

The offending code is in repair_mismatch_dir_hash():

	int ret;

	printf(
	"Deleting bad dir items with invalid hash for root %llu ino %llu\n",
		root->root_key.objectid, rec->ino);
	while (!list_empty(&rec->mismatch_dir_hash)) {
		/* do some repair */
	}
	if (!ret) { <<< Here
		/* do some fix */
	}

The truth is, to enter try_repair_inode(), we must have I_ERR_MISMATCH_DIR_HASH bit set for rec->errors.

And just after we set I_ERR_MISMATCH_DIR_HASH, we call add_mismatch_dir_hash() and handled its error correctly.

Quoted 7 lines

So it's impossible to to skip the while loop.

Fix it by initializing @ret to -EUCLEAN, so even we hit some impossible case, repair_mismatch_dir_hash() won't falsely consider the mismatch hash fixed.

Applied, thanks.