* [PATCH] ext4: set error return correctly when ext4_htree_store_dirent fails
@ 2019-08-05 22:44 Colin King
2019-08-12 20:36 ` Theodore Y. Ts'o
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-08-05 22:44 UTC (permalink / raw)
To: Theodore Ts'o, Andreas Dilger, linux-ext4
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
Currently when the call to ext4_htree_store_dirent fails the error return
variable 'ret' is is not being set to the error code and variable count is
instead, hence the error code is not being returned. Fix this by assigning
ret to the error return code.
Addresses-Coverity: ("Unused value")
Fixes: 8af0f0822797 ("ext4: fix readdir error in the case of inline_data+dir_index")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
fs/ext4/inline.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 88cdf3c90bd1..2fec62d764fa 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -1416,7 +1416,7 @@ int ext4_inlinedir_to_tree(struct file *dir_file,
err = ext4_htree_store_dirent(dir_file, hinfo->hash,
hinfo->minor_hash, de, &tmp_str);
if (err) {
- count = err;
+ ret = err;
goto out;
}
count++;
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] ext4: set error return correctly when ext4_htree_store_dirent fails
2019-08-05 22:44 [PATCH] ext4: set error return correctly when ext4_htree_store_dirent fails Colin King
@ 2019-08-12 20:36 ` Theodore Y. Ts'o
0 siblings, 0 replies; 2+ messages in thread
From: Theodore Y. Ts'o @ 2019-08-12 20:36 UTC (permalink / raw)
To: Colin King; +Cc: Andreas Dilger, linux-ext4, kernel-janitors, linux-kernel
On Mon, Aug 05, 2019 at 11:44:19PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently when the call to ext4_htree_store_dirent fails the error return
> variable 'ret' is is not being set to the error code and variable count is
> instead, hence the error code is not being returned. Fix this by assigning
> ret to the error return code.
>
> Addresses-Coverity: ("Unused value")
> Fixes: 8af0f0822797 ("ext4: fix readdir error in the case of inline_data+dir_index")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied, thanks.
- Ted
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-08-12 20:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-05 22:44 [PATCH] ext4: set error return correctly when ext4_htree_store_dirent fails Colin King
2019-08-12 20:36 ` Theodore Y. Ts'o
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).