Commit 65d30005 authored by Tahsin Erdogan's avatar Tahsin Erdogan Committed by Theodore Ts'o

ext4: ext4_xattr_delete_inode() should return accurate errors

In a few places the function returns without trying to pass the actual
error code to the caller. Fix those.
Signed-off-by: default avatarTahsin Erdogan <tahsin@google.com>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent b347e2bc
...@@ -2024,7 +2024,8 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2024,7 +2024,8 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
if (!entry->e_value_inum) if (!entry->e_value_inum)
continue; continue;
ea_ino = le32_to_cpu(entry->e_value_inum); ea_ino = le32_to_cpu(entry->e_value_inum);
if (ext4_expand_ino_array(lea_ino_array, ea_ino) != 0) { error = ext4_expand_ino_array(lea_ino_array, ea_ino);
if (error) {
brelse(iloc.bh); brelse(iloc.bh);
goto cleanup; goto cleanup;
} }
...@@ -2035,7 +2036,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2035,7 +2036,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
delete_external_ea: delete_external_ea:
if (!EXT4_I(inode)->i_file_acl) { if (!EXT4_I(inode)->i_file_acl) {
/* add xattr inode to orphan list */ /* add xattr inode to orphan list */
ext4_xattr_inode_orphan_add(handle, inode, credits, error = ext4_xattr_inode_orphan_add(handle, inode, credits,
*lea_ino_array); *lea_ino_array);
goto cleanup; goto cleanup;
} }
...@@ -2043,12 +2044,14 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2043,12 +2044,14 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
if (!bh) { if (!bh) {
EXT4_ERROR_INODE(inode, "block %llu read error", EXT4_ERROR_INODE(inode, "block %llu read error",
EXT4_I(inode)->i_file_acl); EXT4_I(inode)->i_file_acl);
error = -EIO;
goto cleanup; goto cleanup;
} }
if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) || if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) ||
BHDR(bh)->h_blocks != cpu_to_le32(1)) { BHDR(bh)->h_blocks != cpu_to_le32(1)) {
EXT4_ERROR_INODE(inode, "bad block %llu", EXT4_ERROR_INODE(inode, "bad block %llu",
EXT4_I(inode)->i_file_acl); EXT4_I(inode)->i_file_acl);
error = -EFSCORRUPTED;
goto cleanup; goto cleanup;
} }
...@@ -2057,7 +2060,8 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2057,7 +2060,8 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
if (!entry->e_value_inum) if (!entry->e_value_inum)
continue; continue;
ea_ino = le32_to_cpu(entry->e_value_inum); ea_ino = le32_to_cpu(entry->e_value_inum);
if (ext4_expand_ino_array(lea_ino_array, ea_ino) != 0) error = ext4_expand_ino_array(lea_ino_array, ea_ino);
if (error)
goto cleanup; goto cleanup;
entry->e_value_inum = 0; entry->e_value_inum = 0;
} }
...@@ -2065,7 +2069,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2065,7 +2069,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
/* add xattr inode to orphan list */ /* add xattr inode to orphan list */
error = ext4_xattr_inode_orphan_add(handle, inode, credits, error = ext4_xattr_inode_orphan_add(handle, inode, credits,
*lea_ino_array); *lea_ino_array);
if (error != 0) if (error)
goto cleanup; goto cleanup;
if (!IS_NOQUOTA(inode)) if (!IS_NOQUOTA(inode))
...@@ -2075,7 +2079,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode, ...@@ -2075,7 +2079,7 @@ ext4_xattr_delete_inode(handle_t *handle, struct inode *inode,
error = ext4_journal_extend(handle, credits); error = ext4_journal_extend(handle, credits);
if (error > 0) if (error > 0)
error = ext4_journal_restart(handle, credits); error = ext4_journal_restart(handle, credits);
if (error != 0) { if (error) {
ext4_warning(inode->i_sb, ext4_warning(inode->i_sb,
"couldn't extend journal (err %d)", error); "couldn't extend journal (err %d)", error);
goto cleanup; goto cleanup;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment