| From c9a484c8fa02c1cefc9557476a8211d7c0963263 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 12 Aug 2019 14:29:38 -0400 |
| Subject: ext4: set error return correctly when ext4_htree_store_dirent fails |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| [ Upstream commit 7a14826ede1d714f0bb56de8167c0e519041eeda ] |
| |
| 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> |
| Signed-off-by: Theodore Ts'o <tytso@mit.edu> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 9a13f86fed626..4df4d31057b36 100644 |
| --- a/fs/ext4/inline.c |
| +++ b/fs/ext4/inline.c |
| @@ -1417,7 +1417,7 @@ int htree_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 |
| |
