Commit dc1c4663 authored by Baokun Li's avatar Baokun Li Committed by Theodore Ts'o

ext4: propagate errors from ext4_sb_bread() in ext4_xattr_block_cache_find()

In ext4_xattr_block_cache_find(), when ext4_sb_bread() returns an error,
we will either continue to find the next ea block or return NULL to try to
insert a new ea block. But whether ext4_sb_bread() returns -EIO or -ENOMEM,
the next operation is most likely to fail with the same error. So propagate
the error returned by ext4_sb_bread() to make ext4_xattr_block_set() fail
to reduce pointless operations.
Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20240504075526.2254349-3-libaokun@huaweicloud.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 0c0b4a49
...@@ -2028,8 +2028,13 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, ...@@ -2028,8 +2028,13 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,
inserted: inserted:
if (!IS_LAST_ENTRY(s->first)) { if (!IS_LAST_ENTRY(s->first)) {
new_bh = ext4_xattr_block_cache_find(inode, header(s->base), new_bh = ext4_xattr_block_cache_find(inode, header(s->base), &ce);
&ce); if (IS_ERR(new_bh)) {
error = PTR_ERR(new_bh);
new_bh = NULL;
goto cleanup;
}
if (new_bh) { if (new_bh) {
/* We found an identical block in the cache. */ /* We found an identical block in the cache. */
if (new_bh == bs->bh) if (new_bh == bs->bh)
...@@ -3094,8 +3099,8 @@ ext4_xattr_cmp(struct ext4_xattr_header *header1, ...@@ -3094,8 +3099,8 @@ ext4_xattr_cmp(struct ext4_xattr_header *header1,
* *
* Find an identical extended attribute block. * Find an identical extended attribute block.
* *
* Returns a pointer to the block found, or NULL if such a block was * Returns a pointer to the block found, or NULL if such a block was not
* not found or an error occurred. * found, or an error pointer if an error occurred while reading ea block.
*/ */
static struct buffer_head * static struct buffer_head *
ext4_xattr_block_cache_find(struct inode *inode, ext4_xattr_block_cache_find(struct inode *inode,
...@@ -3117,13 +3122,11 @@ ext4_xattr_block_cache_find(struct inode *inode, ...@@ -3117,13 +3122,11 @@ ext4_xattr_block_cache_find(struct inode *inode,
bh = ext4_sb_bread(inode->i_sb, ce->e_value, REQ_PRIO); bh = ext4_sb_bread(inode->i_sb, ce->e_value, REQ_PRIO);
if (IS_ERR(bh)) { if (IS_ERR(bh)) {
if (PTR_ERR(bh) == -ENOMEM) { if (PTR_ERR(bh) != -ENOMEM)
mb_cache_entry_put(ea_block_cache, ce); EXT4_ERROR_INODE(inode, "block %lu read error",
return NULL; (unsigned long)ce->e_value);
} mb_cache_entry_put(ea_block_cache, ce);
bh = NULL; return bh;
EXT4_ERROR_INODE(inode, "block %lu read error",
(unsigned long)ce->e_value);
} else if (ext4_xattr_cmp(header, BHDR(bh)) == 0) { } else if (ext4_xattr_cmp(header, BHDR(bh)) == 0) {
*pce = ce; *pce = ce;
return bh; return bh;
......
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