* [PATCH v3] erofs-utils: Add missing error code handling.
@ 2019-07-24 9:12 Pratik Shinde
2019-07-24 13:04 ` Gao Xiang
0 siblings, 1 reply; 2+ messages in thread
From: Pratik Shinde @ 2019-07-24 9:12 UTC (permalink / raw)
Handling error conditions that are missed in few scenarios.
also, mkfs command should return 1 on failure and 0 on success.
Signed-off-by: Pratik Shinde <pratikshinde320 at gmail.com>
---
lib/inode.c | 10 ++++++++--
mkfs/main.c | 8 +++++++-
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/lib/inode.c b/lib/inode.c
index 179aa26..8b38270 100644
--- a/lib/inode.c
+++ b/lib/inode.c
@@ -752,8 +752,14 @@ struct erofs_inode *erofs_mkfs_build_tree(struct erofs_inode *dir)
}
closedir(_dir);
- erofs_prepare_dir_file(dir);
- erofs_prepare_inode_buffer(dir);
+ ret = erofs_prepare_dir_file(dir);
+ if (ret)
+ goto err_closedir;
+
+ ret = erofs_prepare_inode_buffer(dir);
+ if (ret)
+ goto err_closedir;
+
if (IS_ROOT(dir))
erofs_fixup_meta_blkaddr(dir);
diff --git a/mkfs/main.c b/mkfs/main.c
index 1348587..fdb65fd 100644
--- a/mkfs/main.c
+++ b/mkfs/main.c
@@ -212,6 +212,12 @@ int main(int argc, char **argv)
erofs_show_config();
sb_bh = erofs_buffer_init();
+ if (IS_ERR(sb_bh)) {
+ err = PTR_ERR(sb_bh);
+ erofs_err("Failed to initialize buffers: %s",
+ erofs_strerror(err));
+ goto exit;
+ }
err = erofs_bh_balloon(sb_bh, EROFS_SUPER_END);
if (err < 0) {
erofs_err("Failed to balloon erofs_super_block: %s",
@@ -254,5 +260,5 @@ exit:
erofs_strerror(err));
return 1;
}
- return err;
+ return 0;
}
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v3] erofs-utils: Add missing error code handling.
2019-07-24 9:12 [PATCH v3] erofs-utils: Add missing error code handling Pratik Shinde
@ 2019-07-24 13:04 ` Gao Xiang
0 siblings, 0 replies; 2+ messages in thread
From: Gao Xiang @ 2019-07-24 13:04 UTC (permalink / raw)
On 2019/7/24 17:12, Pratik Shinde wrote:
> Handling error conditions that are missed in few scenarios.
> also, mkfs command should return 1 on failure and 0 on success.
>
> Signed-off-by: Pratik Shinde <pratikshinde320 at gmail.com>
looks good to me, will apply later....
(since Li Guifu cannot send outgoing email...I will apply directly.)
Thanks,
Gao Xiang
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-24 13:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 9:12 [PATCH v3] erofs-utils: Add missing error code handling Pratik Shinde
2019-07-24 13:04 ` Gao Xiang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.