diff options
-rw-r--r-- | fs/btrfs/file-item.c | 4 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.c | 5 | ||||
-rw-r--r-- | fs/btrfs/ordered-data.h | 3 | ||||
-rw-r--r-- | fs/btrfs/relocation.c | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/fs/btrfs/file-item.c b/fs/btrfs/file-item.c index 0867fca4b63d..a120d6ba3a28 100644 --- a/fs/btrfs/file-item.c +++ b/fs/btrfs/file-item.c | |||
@@ -469,7 +469,7 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio, | |||
469 | 469 | ||
470 | sums->len = this_sum_bytes; | 470 | sums->len = this_sum_bytes; |
471 | this_sum_bytes = 0; | 471 | this_sum_bytes = 0; |
472 | btrfs_add_ordered_sum(inode, ordered, sums); | 472 | btrfs_add_ordered_sum(ordered, sums); |
473 | btrfs_put_ordered_extent(ordered); | 473 | btrfs_put_ordered_extent(ordered); |
474 | 474 | ||
475 | bytes_left = bio->bi_iter.bi_size - total_bytes; | 475 | bytes_left = bio->bi_iter.bi_size - total_bytes; |
@@ -506,7 +506,7 @@ blk_status_t btrfs_csum_one_bio(struct inode *inode, struct bio *bio, | |||
506 | 506 | ||
507 | } | 507 | } |
508 | this_sum_bytes = 0; | 508 | this_sum_bytes = 0; |
509 | btrfs_add_ordered_sum(inode, ordered, sums); | 509 | btrfs_add_ordered_sum(ordered, sums); |
510 | btrfs_put_ordered_extent(ordered); | 510 | btrfs_put_ordered_extent(ordered); |
511 | return 0; | 511 | return 0; |
512 | } | 512 | } |
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 45e3cfd1198b..f6bb6039fa4c 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
@@ -271,13 +271,12 @@ int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset, | |||
271 | * when an ordered extent is finished. If the list covers more than one | 271 | * when an ordered extent is finished. If the list covers more than one |
272 | * ordered extent, it is split across multiples. | 272 | * ordered extent, it is split across multiples. |
273 | */ | 273 | */ |
274 | void btrfs_add_ordered_sum(struct inode *inode, | 274 | void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, |
275 | struct btrfs_ordered_extent *entry, | ||
276 | struct btrfs_ordered_sum *sum) | 275 | struct btrfs_ordered_sum *sum) |
277 | { | 276 | { |
278 | struct btrfs_ordered_inode_tree *tree; | 277 | struct btrfs_ordered_inode_tree *tree; |
279 | 278 | ||
280 | tree = &BTRFS_I(inode)->ordered_tree; | 279 | tree = &BTRFS_I(entry->inode)->ordered_tree; |
281 | spin_lock_irq(&tree->lock); | 280 | spin_lock_irq(&tree->lock); |
282 | list_add_tail(&sum->list, &entry->list); | 281 | list_add_tail(&sum->list, &entry->list); |
283 | spin_unlock_irq(&tree->lock); | 282 | spin_unlock_irq(&tree->lock); |
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h index fb9a161f0215..4c5991c3de14 100644 --- a/fs/btrfs/ordered-data.h +++ b/fs/btrfs/ordered-data.h | |||
@@ -167,8 +167,7 @@ int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset, | |||
167 | int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset, | 167 | int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset, |
168 | u64 start, u64 len, u64 disk_len, | 168 | u64 start, u64 len, u64 disk_len, |
169 | int type, int compress_type); | 169 | int type, int compress_type); |
170 | void btrfs_add_ordered_sum(struct inode *inode, | 170 | void btrfs_add_ordered_sum(struct btrfs_ordered_extent *entry, |
171 | struct btrfs_ordered_extent *entry, | ||
172 | struct btrfs_ordered_sum *sum); | 171 | struct btrfs_ordered_sum *sum); |
173 | struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode, | 172 | struct btrfs_ordered_extent *btrfs_lookup_ordered_extent(struct inode *inode, |
174 | u64 file_offset); | 173 | u64 file_offset); |
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 25fc6a4f3ecf..2246aa2e30e3 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c | |||
@@ -4604,7 +4604,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len) | |||
4604 | new_bytenr = ordered->start + (sums->bytenr - disk_bytenr); | 4604 | new_bytenr = ordered->start + (sums->bytenr - disk_bytenr); |
4605 | sums->bytenr = new_bytenr; | 4605 | sums->bytenr = new_bytenr; |
4606 | 4606 | ||
4607 | btrfs_add_ordered_sum(inode, ordered, sums); | 4607 | btrfs_add_ordered_sum(ordered, sums); |
4608 | } | 4608 | } |
4609 | out: | 4609 | out: |
4610 | btrfs_put_ordered_extent(ordered); | 4610 | btrfs_put_ordered_extent(ordered); |