ext4: set error return correctly when ext4_htree_store_dirent fails

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>

diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index 88cdf3c90bd15873fe1a2334b446822c73226658..2fec62d764fa91562db22047be9172d6a2b0a1db 100644 (file)
--- 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++;