diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 05:40:54 -0400 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2019-09-05 05:40:54 -0400 |
| commit | 151a41014bff92f353263cadc051435dc9c3258e (patch) | |
| tree | aa082a0745edd5b7051668f455dfc0ee1e4a9de0 /fs/btrfs/backref.c | |
| parent | ae0755b56da9db4190288155ea884331993ed51b (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge tag 'v5.3-rc7' into devel
Linux 5.3-rc7
Diffstat (limited to 'fs/btrfs/backref.c')
| -rw-r--r-- | fs/btrfs/backref.c | 2 |
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, | |||
| 1483 | ulist_init(roots); | 1483 | ulist_init(roots); |
| 1484 | ulist_init(tmp); | 1484 | ulist_init(tmp); |
| 1485 | 1485 | ||
| 1486 | trans = btrfs_attach_transaction(root); | 1486 | trans = btrfs_join_transaction_nostart(root); |
| 1487 | if (IS_ERR(trans)) { | 1487 | if (IS_ERR(trans)) { |
| 1488 | if (PTR_ERR(trans) != -ENOENT && PTR_ERR(trans) != -EROFS) { | 1488 | if (PTR_ERR(trans) != -ENOENT && PTR_ERR(trans) != -EROFS) { |
| 1489 | ret = PTR_ERR(trans); | 1489 | ret = PTR_ERR(trans); |