Skip to content

Commit b049668

Browse files
Liu BoJosef Bacik
Liu Bo
authored and
Josef Bacik
committed
Btrfs: cleanup unused arguments of btrfs_csum_data
Argument 'root' is no more used in btrfs_csum_data(). Signed-off-by: Liu Bo <[email protected]> Signed-off-by: Josef Bacik <[email protected]>
1 parent 0874881 commit b049668

File tree

7 files changed

+15
-21
lines changed

7 files changed

+15
-21
lines changed

‎fs/btrfs/compression.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ static int check_compressed_csum(struct inode *inode,
106106
u64 disk_start)
107107
{
108108
int ret;
109-
struct btrfs_root *root = BTRFS_I(inode)->root;
110109
struct page *page;
111110
unsigned long i;
112111
char *kaddr;
@@ -121,7 +120,7 @@ static int check_compressed_csum(struct inode *inode,
121120
csum = ~(u32)0;
122121

123122
kaddr = kmap_atomic(page);
124-
csum = btrfs_csum_data(root, kaddr, csum, PAGE_CACHE_SIZE);
123+
csum = btrfs_csum_data(kaddr, csum, PAGE_CACHE_SIZE);
125124
btrfs_csum_final(csum, (char *)&csum);
126125
kunmap_atomic(kaddr);
127126

‎fs/btrfs/disk-io.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ static struct extent_map *btree_get_extent(struct inode *inode,
238238
return em;
239239
}
240240

241-
u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len)
241+
u32 btrfs_csum_data(char *data, u32 seed, size_t len)
242242
{
243243
return crc32c(seed, data, len);
244244
}
@@ -274,7 +274,7 @@ static int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
274274
if (err)
275275
return 1;
276276
cur_len = min(len, map_len - (offset - map_start));
277-
crc = btrfs_csum_data(root, kaddr + offset - map_start,
277+
crc = btrfs_csum_data(kaddr + offset - map_start,
278278
crc, cur_len);
279279
len -= cur_len;
280280
offset += cur_len;
@@ -2919,7 +2919,7 @@ static int write_dev_supers(struct btrfs_device *device,
29192919
btrfs_set_super_bytenr(sb, bytenr);
29202920

29212921
crc = ~(u32)0;
2922-
crc = btrfs_csum_data(NULL, (char *)sb +
2922+
crc = btrfs_csum_data((char *)sb +
29232923
BTRFS_CSUM_SIZE, crc,
29242924
BTRFS_SUPER_INFO_SIZE -
29252925
BTRFS_CSUM_SIZE);

‎fs/btrfs/disk-io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ int btrfs_buffer_uptodate(struct extent_buffer *buf, u64 parent_transid,
7777
int atomic);
7878
int btrfs_set_buffer_uptodate(struct extent_buffer *buf);
7979
int btrfs_read_buffer(struct extent_buffer *buf, u64 parent_transid);
80-
u32 btrfs_csum_data(struct btrfs_root *root, char *data, u32 seed, size_t len);
80+
u32 btrfs_csum_data(char *data, u32 seed, size_t len);
8181
void btrfs_csum_final(u32 crc, char *result);
8282
int btrfs_bio_wq_end_io(struct btrfs_fs_info *info, struct bio *bio,
8383
int metadata);

‎fs/btrfs/file-item.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,7 @@ int btrfs_csum_one_bio(struct btrfs_root *root, struct inode *inode,
484484

485485
data = kmap_atomic(bvec->bv_page);
486486
sector_sum->sum = ~(u32)0;
487-
sector_sum->sum = btrfs_csum_data(root,
488-
data + bvec->bv_offset,
487+
sector_sum->sum = btrfs_csum_data(data + bvec->bv_offset,
489488
sector_sum->sum,
490489
bvec->bv_len);
491490
kunmap_atomic(data);

‎fs/btrfs/free-space-cache.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ static void io_ctl_set_crc(struct io_ctl *io_ctl, int index)
431431
if (index == 0)
432432
offset = sizeof(u32) * io_ctl->num_pages;
433433

434-
crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc,
434+
crc = btrfs_csum_data(io_ctl->orig + offset, crc,
435435
PAGE_CACHE_SIZE - offset);
436436
btrfs_csum_final(crc, (char *)&crc);
437437
io_ctl_unmap_page(io_ctl);
@@ -461,7 +461,7 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index)
461461
kunmap(io_ctl->pages[0]);
462462

463463
io_ctl_map_page(io_ctl, 0);
464-
crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc,
464+
crc = btrfs_csum_data(io_ctl->orig + offset, crc,
465465
PAGE_CACHE_SIZE - offset);
466466
btrfs_csum_final(crc, (char *)&crc);
467467
if (val != crc) {

‎fs/btrfs/inode.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,7 +2819,7 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
28192819
if (ret)
28202820
goto zeroit;
28212821

2822-
csum = btrfs_csum_data(root, kaddr + offset, csum, end - start + 1);
2822+
csum = btrfs_csum_data(kaddr + offset, csum, end - start + 1);
28232823
btrfs_csum_final(csum, (char *)&csum);
28242824
if (csum != private)
28252825
goto zeroit;
@@ -6919,7 +6919,6 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
69196919
struct bio_vec *bvec_end = bio->bi_io_vec + bio->bi_vcnt - 1;
69206920
struct bio_vec *bvec = bio->bi_io_vec;
69216921
struct inode *inode = dip->inode;
6922-
struct btrfs_root *root = BTRFS_I(inode)->root;
69236922
u64 start;
69246923

69256924
start = dip->logical_offset;
@@ -6936,7 +6935,7 @@ static void btrfs_endio_direct_read(struct bio *bio, int err)
69366935
goto failed;
69376936
local_irq_save(flags);
69386937
kaddr = kmap_atomic(page);
6939-
csum = btrfs_csum_data(root, kaddr + bvec->bv_offset,
6938+
csum = btrfs_csum_data(kaddr + bvec->bv_offset,
69406939
csum, bvec->bv_len);
69416940
btrfs_csum_final(csum, (char *)&csum);
69426941
kunmap_atomic(kaddr);

‎fs/btrfs/scrub.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,7 +1336,6 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,
13361336
int page_num;
13371337
u8 calculated_csum[BTRFS_CSUM_SIZE];
13381338
u32 crc = ~(u32)0;
1339-
struct btrfs_root *root = fs_info->extent_root;
13401339
void *mapped_buffer;
13411340

13421341
WARN_ON(!sblock->pagev[0]->page);
@@ -1365,12 +1364,11 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info,
13651364

13661365
for (page_num = 0;;) {
13671366
if (page_num == 0 && is_metadata)
1368-
crc = btrfs_csum_data(root,
1367+
crc = btrfs_csum_data(
13691368
((u8 *)mapped_buffer) + BTRFS_CSUM_SIZE,
13701369
crc, PAGE_SIZE - BTRFS_CSUM_SIZE);
13711370
else
1372-
crc = btrfs_csum_data(root, mapped_buffer, crc,
1373-
PAGE_SIZE);
1371+
crc = btrfs_csum_data(mapped_buffer, crc, PAGE_SIZE);
13741372

13751373
kunmap_atomic(mapped_buffer);
13761374
page_num++;
@@ -1657,7 +1655,6 @@ static int scrub_checksum_data(struct scrub_block *sblock)
16571655
void *buffer;
16581656
u32 crc = ~(u32)0;
16591657
int fail = 0;
1660-
struct btrfs_root *root = sctx->dev_root;
16611658
u64 len;
16621659
int index;
16631660

@@ -1674,7 +1671,7 @@ static int scrub_checksum_data(struct scrub_block *sblock)
16741671
for (;;) {
16751672
u64 l = min_t(u64, len, PAGE_SIZE);
16761673

1677-
crc = btrfs_csum_data(root, buffer, crc, l);
1674+
crc = btrfs_csum_data(buffer, crc, l);
16781675
kunmap_atomic(buffer);
16791676
len -= l;
16801677
if (len == 0)
@@ -1744,7 +1741,7 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock)
17441741
for (;;) {
17451742
u64 l = min_t(u64, len, mapped_size);
17461743

1747-
crc = btrfs_csum_data(root, p, crc, l);
1744+
crc = btrfs_csum_data(p, crc, l);
17481745
kunmap_atomic(mapped_buffer);
17491746
len -= l;
17501747
if (len == 0)
@@ -1805,7 +1802,7 @@ static int scrub_checksum_super(struct scrub_block *sblock)
18051802
for (;;) {
18061803
u64 l = min_t(u64, len, mapped_size);
18071804

1808-
crc = btrfs_csum_data(root, p, crc, l);
1805+
crc = btrfs_csum_data(p, crc, l);
18091806
kunmap_atomic(mapped_buffer);
18101807
len -= l;
18111808
if (len == 0)

0 commit comments

Comments
 (0)