Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c
index 89116afda7a2..e5d85311d5d5 100644
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
@@ -1483,7 +1483,7 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr,
         ulist_init(roots);
         ulist_init(tmp);
 
-        trans = btrfs_attach_transaction(root);
+        trans = btrfs_join_transaction_nostart(root);
         if (IS_ERR(trans)) {
                 if (PTR_ERR(trans) != -ENOENT && PTR_ERR(trans) != -EROFS) {
                         ret = PTR_ERR(trans);