Skip to contentSkip to conversation

btrfs-progs: simple cleanup related to LLVM (not LLM)

PATCH Superseded Qu Wenruo 3 participants 6 messages Oct 27 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Qu Wenruo

author
#0 lore raw

cover btrfs-progs: simple cleanup related to LLVM (not LLM)

When using LLVM to compile btrfs-progs, two unused global variables are exposed. Fix them.

Secondly recently I move to use GNUmakefile to customize the make behavior, e.g. add "-j12" make flags, without modifying the existing Makefile.

Also add GNUmakefile to gitignore.

Qu Wenruo (2):
btrfs-progs: remove set but unused variables
btrfs-progs: gitignore: add GNUmakefile

 GNUmakefile                     | 2 ++
 cmds/inspect-tree-stats.c       | 3 ---
 cmds/rescue-fix-data-checksum.c | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)
 create mode 100644 GNUmakefile

--
2.56.0

author
#1 lore raw

PATCH 1/2 btrfs-progs: remove set but unused variables

If using clang to compile btrfs-progs, two warnings will be reported:

cmds/rescue-fix-data-checksum.c:73:12: warning: variable 'global_repair_mode' set but not used [-Wunused-but-set-global]

    73 | static int global_repair_mode;
       |            ^
 1 warning generated.
 cmds/inspect-tree-stats.c:43:12: warning: variable 'verbose' set but not used [-Wunused-but-set-global]
    43 | static int verbose = 0;
       |            ^

1 warning generated.

Both are correct reports, so just remove them.

---
 cmds/inspect-tree-stats.c       | 3 ---
 cmds/rescue-fix-data-checksum.c | 2 --
 2 files changed, 5 deletions(-)
cmds/inspect-tree-stats.c +0 -3
index c6907bb0cd78..b45416fd16b7 100644
@@ -40,8 +40,6 @@
 #include "common/units.h"
 #include "cmds/commands.h"
 
-static int verbose = 0;
-
 struct seek {
 	u64 distance;
 	u64 count;
@@ -462,7 +460,6 @@ static int cmd_inspect_tree_stats(const struct cmd_struct *cmd,
 	while ((opt = getopt(argc, argv, "vbt:")) != -1) {
 		switch (opt) {
 		case 'v':
-			verbose++;
 			break;
 		case 'b':
 			unit_mode = UNITS_RAW;
cmds/rescue-fix-data-checksum.c +0 -2
index 3925d5170627..121fb0b46ca8 100644
@@ -70,7 +70,6 @@ static const struct fix_data_checksum_action {
 	},
 };
 
-static int global_repair_mode;
 LIST_HEAD(corrupted_blocks);
 
 static int add_corrupted_block(struct btrfs_fs_info *fs_info, u64 logical,
@@ -486,7 +485,6 @@ int btrfs_recover_fix_data_checksum(const char *path, enum btrfs_fix_data_checks
 		return -EBUSY;
 	}
 
-	global_repair_mode = mode;
 	oca.filename = path;
 	oca.flags = OPEN_CTREE_WRITES;
 	fs_info = open_ctree_fs_info(&oca);
Signature · 1 line
2.56.0
author
#3 lore raw

PATCH 2/2 btrfs-progs: gitignore: add GNUmakefile

In reply to Qu Wenruo

I use GNUmakefile to add extra compiling flags without modifying the existing Makefile:

MAKEFLAGS += -j12
include Makefile

So the GNUmakefile is more or less reflecting personal tastes, better to add it to gitignore.

---
 GNUmakefile | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 GNUmakefile
GNUmakefile new file +2 -0
new file mode 100644
index 000000000000..e0eaca65651c
@@ -0,0 +1,2 @@
+MAKEFLAGS += -j12
+include Makefile
Signature · 1 line
2.56.0
#4 lore raw

Re: [PATCH 2/2] btrfs-progs: gitignore: add GNUmakefile

Quoted 8 lines · Qu Wenruo

I use GNUmakefile to add extra compiling flags without modifying the existing Makefile:

MAKEFLAGS += -j12
include Makefile

So the GNUmakefile is more or less reflecting personal tastes, better to add it to gitignore.

So better to add it to gitignore I guess ;-)

--nX

Quoted 18 lines
---
 GNUmakefile | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 GNUmakefile
GNUmakefile new file +2 -1
new file mode 100644
index 000000000000..e0eaca65651c
@@ -0,0 +1,2 @@
+MAKEFLAGS += -j12
+include Makefile
--

2.56.0

Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] btrfs-progs: remove set but unused variables

In reply to Qu Wenruo
Quoted 9 lines · Qu Wenruo

If using clang to compile btrfs-progs, two warnings will be reported:

cmds/rescue-fix-data-checksum.c:73:12: warning: variable 'global_repair_mode' set but not used [-Wunused-but-set-global]

    73 | static int global_repair_mode;
       |            ^
 1 warning generated.
 cmds/inspect-tree-stats.c:43:12: warning: variable 'verbose' set but not used [-Wunused-but-set-global]
    43 | static int verbose = 0;
       |            ^
Quoted 5 lines

1 warning generated.

Both are correct reports, so just remove them.

LGTM.

Thanks

Quoted 50 lines
---
 cmds/inspect-tree-stats.c       | 3 ---
 cmds/rescue-fix-data-checksum.c | 2 --
 2 files changed, 5 deletions(-)
cmds/inspect-tree-stats.c +0 -3
index c6907bb0cd78..b45416fd16b7 100644
@@ -40,8 +40,6 @@
 #include "common/units.h"
 #include "cmds/commands.h"
 
-static int verbose = 0;
-
 struct seek {
        u64 distance;
        u64 count;
@@ -462,7 +460,6 @@ static int cmd_inspect_tree_stats(const struct cmd_struct *cmd,
        while ((opt = getopt(argc, argv, "vbt:")) != -1) {
                switch (opt) {
                case 'v':
-                       verbose++;
                        break;
                case 'b':
                        unit_mode = UNITS_RAW;
cmds/rescue-fix-data-checksum.c +0 -3
index 3925d5170627..121fb0b46ca8 100644
@@ -70,7 +70,6 @@ static const struct fix_data_checksum_action {
        },
 };
 
-static int global_repair_mode;
 LIST_HEAD(corrupted_blocks);
 
 static int add_corrupted_block(struct btrfs_fs_info *fs_info, u64 logical,
@@ -486,7 +485,6 @@ int btrfs_recover_fix_data_checksum(const char *path, enum btrfs_fix_data_checks
                return -EBUSY;
        }
 
-       global_repair_mode = mode;
        oca.filename = path;
        oca.flags = OPEN_CTREE_WRITES;
        fs_info = open_ctree_fs_info(&oca);
--

2.56.0

#5 lore raw

Re: [PATCH 2/2] btrfs-progs: gitignore: add GNUmakefile

In reply to Daniel Vacek
Quoted 11 lines · Daniel Vacek
Quoted 8 lines · Qu Wenruo

I use GNUmakefile to add extra compiling flags without modifying the existing Makefile:

MAKEFLAGS += -j12
include Makefile

So the GNUmakefile is more or less reflecting personal tastes, better to add it to gitignore.

So better to add it to gitignore I guess ;-)

Facepalm, I didn't notice what's going wrong until two lines later...

Quoted 22 lines

--nX

Quoted 18 lines
---
  GNUmakefile | 2 ++
  1 file changed, 2 insertions(+)

create mode 100644 GNUmakefile

GNUmakefile new file +2 -1
new file mode 100644
index 000000000000..e0eaca65651c
@@ -0,0 +1,2 @@
+MAKEFLAGS += -j12
+include Makefile
--

2.56.0