summaryrefslogtreecommitdiff
path: root/e2fsck/journal.c
diff options
context:
space:
mode:
authorAndreas Dilger <adilger@dilger.ca>2022-08-04 11:18:32 -0600
committerTheodore Ts'o <tytso@mit.edu>2022-08-11 10:11:09 -0400
commit9d8b56b3b5d59691f16a8b8ae5fb763bc6be3d15 (patch)
tree302590561e196b549b7dd6817b32331acfb3d898 /e2fsck/journal.c
parentb609d01e6d200638aad42adee922f91d91e3e642 (diff)
downloade2fsprogs-9d8b56b3b5d59691f16a8b8ae5fb763bc6be3d15.tar.gz
Quiet unused variable warnings
Quiet various compiler warnings about unreferenced or unset variables. Signed-off-by: Andreas Dilger <adilger@dilger.ca> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'e2fsck/journal.c')
-rw-r--r--e2fsck/journal.c15
1 files changed, 7 insertions, 8 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;
}