summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-05-11 19:43:16 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-05-11 19:43:16 +0300
commit88b06399c9c766c283e070b022b5ceafa4f63f19 (patch)
treecb6ac55ee01c808fbf0b59b9df32d33eca6dd4be /fs
parent1140ab592e2ebf8153d2b322604031a8868ce7a5 (diff)
parent9b8a233bc294dd71d3c7d30692a78ab32f246a0f (diff)
downloadlinux-88b06399c9c766c283e070b022b5ceafa4f63f19.tar.xz
Merge tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba: "Handle transaction start error in btrfs_fileattr_set() This is fix for code introduced by the new fileattr merge" * tag 'for-5.13-rc1-part2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: handle transaction start error in btrfs_fileattr_set
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 21d2e3df1b4f..5dc2fd843ae3 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -259,6 +259,8 @@ int btrfs_fileattr_set(struct user_namespace *mnt_userns,
if (!fa->flags_valid) {
/* 1 item for the inode */
trans = btrfs_start_transaction(root, 1);
+ if (IS_ERR(trans))
+ return PTR_ERR(trans);
goto update_flags;
}