The following commit has been merged in the master branch: commit 1986c10acc9c906e453fb19d86e6342e8e525824 Merge: 64570fbc14f8d7cb3fe3995f20e26bc25ce4b2cc 4afb912f439c4bc4e6a4f3e7547f2e69e354108f Author: Linus Torvalds torvalds@linux-foundation.org Date: Mon Oct 11 16:48:19 2021 -0700

Merge tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Pull btrfs fixes from David Sterba: "A few more error handling fixes, stemming from code inspection, error injection or fuzzing"

* tag 'for-5.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: btrfs: fix abort logic in btrfs_replace_file_extents btrfs: check for error when looking up inode during dir entry replay btrfs: unify lookup return value when dir entry is missing btrfs: deal with errors when adding inode reference during log replay btrfs: deal with errors when replaying dir entry during log replay btrfs: deal with errors when checking if a dir entry exists during log replay btrfs: update refs for any root except tree log roots btrfs: unlock newly allocated extent buffer after error

diff --combined fs/btrfs/ctree.h index dff2c8a3e059,852a49dcc22b..c0cebcf745ce --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@@ -3030,7 -3030,7 +3030,7 @@@ struct btrfs_dir_item btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, u64 dir, - u64 objectid, const char *name, int name_len, + u64 index, const char *name, int name_len, int mod); struct btrfs_dir_item * btrfs_search_dir_index_item(struct btrfs_root *root, @@@ -3706,7 -3706,7 +3706,7 @@@ static inline int __btrfs_fs_compat_ro(

/* acl.c */ #ifdef CONFIG_BTRFS_FS_POSIX_ACL -struct posix_acl *btrfs_get_acl(struct inode *inode, int type); +struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu); int btrfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode, struct posix_acl *acl, int type); int btrfs_init_acl(struct btrfs_trans_handle *trans,