diff mbox series

[v2,1/4] e2fsck: don't ignore return values in e2fsck_rewrite_extent_tree

Message ID 20210223174156.308507-1-harshads@google.com
State Accepted
Headers show
Series [v2,1/4] e2fsck: don't ignore return values in e2fsck_rewrite_extent_tree | expand

Commit Message

harshad shirwadkar Feb. 23, 2021, 5:41 p.m. UTC 
From: Harshad Shirwadkar <harshadshirwadkar@gmail.com>

Don't ignore return values of library function calls in
e2fsck_rewrite_extent_tree.

Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
---
 e2fsck/extents.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Comments

Theodore Ts'o Feb. 23, 2021, 6:06 p.m. UTC | #1 
On Tue, Feb 23, 2021 at 09:41:53AM -0800, Harshad Shirwadkar wrote:
> From: Harshad Shirwadkar <harshadshirwadkar@gmail.com>
> 
> Don't ignore return values of library function calls in
> e2fsck_rewrite_extent_tree.
> 
> Signed-off-by: Harshad Shirwadkar <harshadshirwadkar@gmail.com>

Thanks, I've applied this patch series.

						- Ted
diff mbox series

Patch

diff --git a/e2fsck/extents.c b/e2fsck/extents.c
index 600dbc97..018737af 100644
--- a/e2fsck/extents.c
+++ b/e2fsck/extents.c
@@ -290,8 +290,10 @@  errcode_t e2fsck_rewrite_extent_tree(e2fsck_t ctx, struct extent_list *list)
 	errcode_t err;
 
 	memset(&inode, 0, sizeof(inode));
-	ext2fs_read_inode_full(ctx->fs, list->ino, EXT2_INODE(&inode),
-				sizeof(inode));
+	err = ext2fs_read_inode_full(ctx->fs, list->ino, EXT2_INODE(&inode),
+				     sizeof(inode));
+	if (err)
+		return err;
 
 	/* Skip deleted inodes and inline data files */
 	if (inode.i_flags & EXT4_INLINE_DATA_FL)
@@ -305,11 +307,11 @@  errcode_t e2fsck_rewrite_extent_tree(e2fsck_t ctx, struct extent_list *list)
 				  &blk_count);
 	if (err)
 		return err;
-	ext2fs_iblk_set(ctx->fs, EXT2_INODE(&inode), blk_count);
-	ext2fs_write_inode_full(ctx->fs, list->ino, EXT2_INODE(&inode),
-		sizeof(inode));
-
-	return 0;
+	err = ext2fs_iblk_set(ctx->fs, EXT2_INODE(&inode), blk_count);
+	if (err)
+		return err;
+	return ext2fs_write_inode_full(ctx->fs, list->ino, EXT2_INODE(&inode),
+				       sizeof(inode));
 }
 
 errcode_t e2fsck_read_extents(e2fsck_t ctx, struct extent_list *extents)