Commit 88b06399 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1140ab59 9b8a233b

fs/btrfs/ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}