| commit | 157378f43faad830e4aa3815bde5fa9f9a9f5be6 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 15:47:50 2022 +0200 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Mon Apr 04 17:19:45 2022 +0200 |
| tree | a6c9afae04d547459872e71460db6f8a454a070c | |
| parent | 0e64123141f3854e695eb4924d82b52856691466 [diff] [blame] |
Update Linux to v5.10.109 Sourced from [1] [1] https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.109.tar.xz Change-Id: I19bca9fc6762d4e63bcf3e4cba88bbe560d9c76c Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c index 5f9e2dd..d3f28b8 100644 --- a/fs/btrfs/tree-defrag.c +++ b/fs/btrfs/tree-defrag.c
@@ -35,7 +35,7 @@ goto out; } - if (!test_bit(BTRFS_ROOT_REF_COWS, &root->state)) + if (!test_bit(BTRFS_ROOT_SHAREABLE, &root->state)) goto out; path = btrfs_alloc_path(); @@ -133,10 +133,9 @@ ret = 0; } done: - if (ret != -EAGAIN) { + if (ret != -EAGAIN) memset(&root->defrag_progress, 0, sizeof(root->defrag_progress)); - root->defrag_trans_start = trans->transid; - } + return ret; }