Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: limit the path size in send to PATH_MAX Btrfs: correctly set profile flags on seqlock retry Btrfs: use correct key when repeating search for extent item Btrfs: fix inode caching vs tree log Btrfs: fix possible memory leaks in open_ctree() Btrfs: avoid triggering bug_on() when we fail to start inode caching task Btrfs: move btrfs_{set,clear}_and_info() to ctree.h btrfs: replace error code from btrfs_drop_extents btrfs: Change the hole range to a more accurate value. btrfs: fix use-after-free in mount_subvol()
This commit is contained in:
@@ -3066,7 +3066,7 @@ process_slot:
|
||||
new_key.offset + datal,
|
||||
1);
|
||||
if (ret) {
|
||||
if (ret != -EINVAL)
|
||||
if (ret != -EOPNOTSUPP)
|
||||
btrfs_abort_transaction(trans,
|
||||
root, ret);
|
||||
btrfs_end_transaction(trans, root);
|
||||
@@ -3141,7 +3141,7 @@ process_slot:
|
||||
new_key.offset + datal,
|
||||
1);
|
||||
if (ret) {
|
||||
if (ret != -EINVAL)
|
||||
if (ret != -EOPNOTSUPP)
|
||||
btrfs_abort_transaction(trans,
|
||||
root, ret);
|
||||
btrfs_end_transaction(trans, root);
|
||||
|
Reference in New Issue
Block a user