diff options
| author | Filipe Manana <fdmanana@suse.com> | 2022-04-21 11:03:09 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2022-04-27 22:20:21 +0200 |
| commit | 193b4e83986d7ee6caa8ceefb5ee9f58240fbee0 (patch) | |
| tree | d37c519c9895d71e5e200c160bd2a8c231b06cb7 /fs/btrfs | |
| parent | d0e64a981fd841cb0f28fcd6afcac55e6f1e6994 (diff) | |
| download | linux-stable-193b4e83986d7ee6caa8ceefb5ee9f58240fbee0.tar.gz linux-stable-193b4e83986d7ee6caa8ceefb5ee9f58240fbee0.tar.bz2 linux-stable-193b4e83986d7ee6caa8ceefb5ee9f58240fbee0.zip | |
btrfs: do not BUG_ON() on failure to update inode when setting xattr
We are doing a BUG_ON() if we fail to update an inode after setting (or
clearing) a xattr, but there's really no reason to not instead simply
abort the transaction and return the error to the caller. This should be
a rare error because we have previously reserved enough metadata space to
update the inode and the delayed inode should have already been setup, so
an -ENOSPC or -ENOMEM, which are the possible errors, are very unlikely to
happen.
So replace the BUG_ON()s with a transaction abort.
CC: stable@vger.kernel.org # 4.9+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/xattr.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 9632d0ff2038..367bb87b66df 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c @@ -262,7 +262,8 @@ int btrfs_setxattr_trans(struct inode *inode, const char *name, inode_inc_iversion(inode); inode->i_ctime = current_time(inode); ret = btrfs_update_inode(trans, root, BTRFS_I(inode)); - BUG_ON(ret); + if (ret) + btrfs_abort_transaction(trans, ret); out: if (start_trans) btrfs_end_transaction(trans); @@ -416,7 +417,8 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler, inode_inc_iversion(inode); inode->i_ctime = current_time(inode); ret = btrfs_update_inode(trans, root, BTRFS_I(inode)); - BUG_ON(ret); + if (ret) + btrfs_abort_transaction(trans, ret); } btrfs_end_transaction(trans); |