2022-08-04 17:17:54

by Andreas Dilger

Subject: [PATCH] misc: quiet unused variable warnings

Quiet unreferenced variable warning if jbd_debug() is a no-op.
Quiet unset variable warning because compiler is dumb.

Signed-off-by: Andreas Dilger <[email protected]>
---
e2fsck/journal.c | 15 +++++++--------
lib/ext2fs/swapfs.c | 2 +-
2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/e2fsck/journal.c b/e2fsck/journal.c
index 12487e3d..571de83e 100644
--- a/e2fsck/journal.c
+++ b/e2fsck/journal.c
@@ -620,7 +620,6 @@ static inline int tl_to_darg(struct dentry_info_args *darg,
struct ext4_fc_tl *tl, __u8 *val)
{
struct ext4_fc_dentry_info fcd;
- int tag = le16_to_cpu(tl->fc_tag);

memcpy(&fcd, val, sizeof(fcd));

@@ -636,10 +635,10 @@ static inline int tl_to_darg(struct dentry_info_args *darg,
darg->dname_len);
darg->dname[darg->dname_len] = 0;
jbd_debug(1, "%s: %s, ino %lu, parent %lu\n",
- tag == EXT4_FC_TAG_CREAT ? "create" :
- (tag == EXT4_FC_TAG_LINK ? "link" :
- (tag == EXT4_FC_TAG_UNLINK ? "unlink" : "error")),
- darg->dname, darg->ino, darg->parent_ino);
+ le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_CREAT ? "create" :
+ (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_LINK ? "link" :
+ (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_UNLINK ? "unlink" :
+ "error")), darg->dname, darg->ino, darg->parent_ino);
return 0;
}

@@ -652,11 +651,11 @@ static int ext4_fc_handle_unlink(e2fsck_t ctx, struct ext4_fc_tl *tl, __u8 *val)
if (ret)
return ret;
ext4_fc_flush_extents(ctx, darg.ino);
- ret = errcode_to_errno(
- ext2fs_unlink(ctx->fs, darg.parent_ino,
- darg.dname, darg.ino, 0));
+ ret = errcode_to_errno(ext2fs_unlink(ctx->fs, darg.parent_ino,
+ darg.dname, darg.ino, 0));
/* It's okay if the above call fails */
free(darg.dname);
+
return ret;
}

diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index 1006b2d2..cd160b31 100644
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -244,7 +244,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
int bufsize)
{
unsigned i, extra_isize, attr_magic;
- int has_extents, has_inline_data, islnk, fast_symlink;
+ int has_extents = 0, has_inline_data = 0, islnk = 0, fast_symlink = 0;
unsigned int inode_size;
__u32 *eaf, *eat;

--
2.25.1

2022-08-04 21:09:07

by Andreas Dilger

Subject: Re: [PATCH] misc: quiet unused variable warnings

Sorry about the duplicate patch, I got an error sending from my one laptop and thought it didn't go out.

Cheers, Andreas

On Aug 4, 2022, at 11:16, Andreas Dilger <[email protected]> wrote:
>
> Quiet unreferenced variable warning if jbd_debug() is a no-op.
> Quiet unset variable warning because compiler is dumb.
>
> Signed-off-by: Andreas Dilger <[email protected]>
> ---
> e2fsck/journal.c | 15 +++++++--------
> lib/ext2fs/swapfs.c | 2 +-
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/e2fsck/journal.c b/e2fsck/journal.c
> index 12487e3d..571de83e 100644
> --- a/e2fsck/journal.c
> +++ b/e2fsck/journal.c
> @@ -620,7 +620,6 @@ static inline int tl_to_darg(struct dentry_info_args *darg,
> struct ext4_fc_tl *tl, __u8 *val)
> {
> struct ext4_fc_dentry_info fcd;
> - int tag = le16_to_cpu(tl->fc_tag);
>
> memcpy(&fcd, val, sizeof(fcd));
>
> @@ -636,10 +635,10 @@ static inline int tl_to_darg(struct dentry_info_args *darg,
> darg->dname_len);
> darg->dname[darg->dname_len] = 0;
> jbd_debug(1, "%s: %s, ino %lu, parent %lu\n",
> - tag == EXT4_FC_TAG_CREAT ? "create" :
> - (tag == EXT4_FC_TAG_LINK ? "link" :
> - (tag == EXT4_FC_TAG_UNLINK ? "unlink" : "error")),
> - darg->dname, darg->ino, darg->parent_ino);
> + le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_CREAT ? "create" :
> + (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_LINK ? "link" :
> + (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_UNLINK ? "unlink" :
> + "error")), darg->dname, darg->ino, darg->parent_ino);
> return 0;
> }
>
> @@ -652,11 +651,11 @@ static int ext4_fc_handle_unlink(e2fsck_t ctx, struct ext4_fc_tl *tl, __u8 *val)
> if (ret)
> return ret;
> ext4_fc_flush_extents(ctx, darg.ino);
> - ret = errcode_to_errno(
> - ext2fs_unlink(ctx->fs, darg.parent_ino,
> - darg.dname, darg.ino, 0));
> + ret = errcode_to_errno(ext2fs_unlink(ctx->fs, darg.parent_ino,
> + darg.dname, darg.ino, 0));
> /* It's okay if the above call fails */
> free(darg.dname);
> +
> return ret;
> }
>
> diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
> index 1006b2d2..cd160b31 100644
> --- a/lib/ext2fs/swapfs.c
> +++ b/lib/ext2fs/swapfs.c
> @@ -244,7 +244,7 @@ void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
> int bufsize)
> {
> unsigned i, extra_isize, attr_magic;
> - int has_extents, has_inline_data, islnk, fast_symlink;
> + int has_extents = 0, has_inline_data = 0, islnk = 0, fast_symlink = 0;
> unsigned int inode_size;
> __u32 *eaf, *eat;
>
> --
> 2.25.1
>