2020-11-06 05:50:30

by Alex Shi

Subject: [PATCH] fs/nilfs2: remove some unused macros to tame gcc

There some macros are unused and cause gcc warning. Remove them.

fs/nilfs2/segment.c:137:0: warning: macro "nilfs_cnt32_gt" is not used
[-Wunused-macros]
fs/nilfs2/segment.c:144:0: warning: macro "nilfs_cnt32_le" is not used
[-Wunused-macros]
fs/nilfs2/segment.c:143:0: warning: macro "nilfs_cnt32_lt" is not used
[-Wunused-macros]

Signed-off-by: Alex Shi <[email protected]>
Cc: Ryusuke Konishi <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
fs/nilfs2/segment.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index e3726aca28ed..cd4da9535aed 100644
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -134,14 +134,9 @@ struct nilfs_sc_operations {
static void nilfs_segctor_do_immediate_flush(struct nilfs_sc_info *);
static void nilfs_dispose_list(struct the_nilfs *, struct list_head *, int);

-#define nilfs_cnt32_gt(a, b) \
- (typecheck(__u32, a) && typecheck(__u32, b) && \
- ((__s32)(b) - (__s32)(a) < 0))
#define nilfs_cnt32_ge(a, b) \
(typecheck(__u32, a) && typecheck(__u32, b) && \
((__s32)(a) - (__s32)(b) >= 0))
-#define nilfs_cnt32_lt(a, b) nilfs_cnt32_gt(b, a)
-#define nilfs_cnt32_le(a, b) nilfs_cnt32_ge(b, a)

static int nilfs_prepare_segment_lock(struct super_block *sb,
struct nilfs_transaction_info *ti)
--
1.8.3.1

2020-12-09 22:34:01

by Ryusuke Konishi

Subject: Re: [PATCH] fs/nilfs2: remove some unused macros to tame gcc

Hi Andrew,

Please queue this, a gcc warning fix, for the next merge window.

Thanks,
Ryusuke Konishi

On Thu, Dec 10, 2020 at 7:25 AM Ryusuke Konishi
<[email protected]> wrote:
>
> From: Alex Shi <[email protected]>
>
> There some macros are unused and cause gcc warning. Remove them.
>
> fs/nilfs2/segment.c:137:0: warning: macro "nilfs_cnt32_gt" is not used
> [-Wunused-macros]
> fs/nilfs2/segment.c:144:0: warning: macro "nilfs_cnt32_le" is not used
> [-Wunused-macros]
> fs/nilfs2/segment.c:143:0: warning: macro "nilfs_cnt32_lt" is not used
> [-Wunused-macros]
>
> Signed-off-by: Alex Shi <[email protected]>
> Signed-off-by: Ryusuke Konishi <[email protected]>
> ---
> fs/nilfs2/segment.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
> index e3726aca28ed..cd4da9535aed 100644
> --- a/fs/nilfs2/segment.c
> +++ b/fs/nilfs2/segment.c
> @@ -134,14 +134,9 @@ struct nilfs_sc_operations {
> static void nilfs_segctor_do_immediate_flush(struct nilfs_sc_info *);
> static void nilfs_dispose_list(struct the_nilfs *, struct list_head *, int);
>
> -#define nilfs_cnt32_gt(a, b) \
> - (typecheck(__u32, a) && typecheck(__u32, b) && \
> - ((__s32)(b) - (__s32)(a) < 0))
> #define nilfs_cnt32_ge(a, b) \
> (typecheck(__u32, a) && typecheck(__u32, b) && \
> ((__s32)(a) - (__s32)(b) >= 0))
> -#define nilfs_cnt32_lt(a, b) nilfs_cnt32_gt(b, a)
> -#define nilfs_cnt32_le(a, b) nilfs_cnt32_ge(b, a)
>
> static int nilfs_prepare_segment_lock(struct super_block *sb,
> struct nilfs_transaction_info *ti)
> --
> 1.8.3.1
>