diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-11 18:43:16 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-11 18:43:16 +0200 |
| commit | 88b06399c9c766c283e070b022b5ceafa4f63f19 (patch) | |
| tree | cb6ac55ee01c808fbf0b59b9df32d33eca6dd4be /fs | |
| parent | Merge tag 'perf-tools-fixes-for-v5.13-2021-05-10' of git://git.kernel.org/pub... (diff) | |
| parent | btrfs: handle transaction start error in btrfs_fileattr_set (diff) | |
| download | linux-88b06399c9c766c283e070b022b5ceafa4f63f19.tar.xz linux-88b06399c9c766c283e070b022b5ceafa4f63f19.zip | |
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.c | 2 |
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; } |