diff options
author | Liu Bo <bo.li.liu@oracle.com> | 2013-03-14 10:57:45 -0400 |
---|---|---|
committer | Josef Bacik <jbacik@fusionio.com> | 2013-05-06 15:54:14 -0400 |
commit | b0496686ba0da69cfd2433ef55fb2d1dc7465084 (patch) | |
tree | 78239a9c6f3a7015416f261968a8bbc359c067a8 /fs/btrfs/scrub.c | |
parent | 087488109afb4cc1bbdd3557779129c34045609a (diff) |
Btrfs: cleanup unused arguments of btrfs_csum_data
Argument 'root' is no more used in btrfs_csum_data().
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 85e072b956d5..3d29d60bdaf8 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
@@ -1336,7 +1336,6 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info, | |||
1336 | int page_num; | 1336 | int page_num; |
1337 | u8 calculated_csum[BTRFS_CSUM_SIZE]; | 1337 | u8 calculated_csum[BTRFS_CSUM_SIZE]; |
1338 | u32 crc = ~(u32)0; | 1338 | u32 crc = ~(u32)0; |
1339 | struct btrfs_root *root = fs_info->extent_root; | ||
1340 | void *mapped_buffer; | 1339 | void *mapped_buffer; |
1341 | 1340 | ||
1342 | WARN_ON(!sblock->pagev[0]->page); | 1341 | WARN_ON(!sblock->pagev[0]->page); |
@@ -1365,12 +1364,11 @@ static void scrub_recheck_block_checksum(struct btrfs_fs_info *fs_info, | |||
1365 | 1364 | ||
1366 | for (page_num = 0;;) { | 1365 | for (page_num = 0;;) { |
1367 | if (page_num == 0 && is_metadata) | 1366 | if (page_num == 0 && is_metadata) |
1368 | crc = btrfs_csum_data(root, | 1367 | crc = btrfs_csum_data( |
1369 | ((u8 *)mapped_buffer) + BTRFS_CSUM_SIZE, | 1368 | ((u8 *)mapped_buffer) + BTRFS_CSUM_SIZE, |
1370 | crc, PAGE_SIZE - BTRFS_CSUM_SIZE); | 1369 | crc, PAGE_SIZE - BTRFS_CSUM_SIZE); |
1371 | else | 1370 | else |
1372 | crc = btrfs_csum_data(root, mapped_buffer, crc, | 1371 | crc = btrfs_csum_data(mapped_buffer, crc, PAGE_SIZE); |
1373 | PAGE_SIZE); | ||
1374 | 1372 | ||
1375 | kunmap_atomic(mapped_buffer); | 1373 | kunmap_atomic(mapped_buffer); |
1376 | page_num++; | 1374 | page_num++; |
@@ -1657,7 +1655,6 @@ static int scrub_checksum_data(struct scrub_block *sblock) | |||
1657 | void *buffer; | 1655 | void *buffer; |
1658 | u32 crc = ~(u32)0; | 1656 | u32 crc = ~(u32)0; |
1659 | int fail = 0; | 1657 | int fail = 0; |
1660 | struct btrfs_root *root = sctx->dev_root; | ||
1661 | u64 len; | 1658 | u64 len; |
1662 | int index; | 1659 | int index; |
1663 | 1660 | ||
@@ -1674,7 +1671,7 @@ static int scrub_checksum_data(struct scrub_block *sblock) | |||
1674 | for (;;) { | 1671 | for (;;) { |
1675 | u64 l = min_t(u64, len, PAGE_SIZE); | 1672 | u64 l = min_t(u64, len, PAGE_SIZE); |
1676 | 1673 | ||
1677 | crc = btrfs_csum_data(root, buffer, crc, l); | 1674 | crc = btrfs_csum_data(buffer, crc, l); |
1678 | kunmap_atomic(buffer); | 1675 | kunmap_atomic(buffer); |
1679 | len -= l; | 1676 | len -= l; |
1680 | if (len == 0) | 1677 | if (len == 0) |
@@ -1744,7 +1741,7 @@ static int scrub_checksum_tree_block(struct scrub_block *sblock) | |||
1744 | for (;;) { | 1741 | for (;;) { |
1745 | u64 l = min_t(u64, len, mapped_size); | 1742 | u64 l = min_t(u64, len, mapped_size); |
1746 | 1743 | ||
1747 | crc = btrfs_csum_data(root, p, crc, l); | 1744 | crc = btrfs_csum_data(p, crc, l); |
1748 | kunmap_atomic(mapped_buffer); | 1745 | kunmap_atomic(mapped_buffer); |
1749 | len -= l; | 1746 | len -= l; |
1750 | if (len == 0) | 1747 | if (len == 0) |
@@ -1805,7 +1802,7 @@ static int scrub_checksum_super(struct scrub_block *sblock) | |||
1805 | for (;;) { | 1802 | for (;;) { |
1806 | u64 l = min_t(u64, len, mapped_size); | 1803 | u64 l = min_t(u64, len, mapped_size); |
1807 | 1804 | ||
1808 | crc = btrfs_csum_data(root, p, crc, l); | 1805 | crc = btrfs_csum_data(p, crc, l); |
1809 | kunmap_atomic(mapped_buffer); | 1806 | kunmap_atomic(mapped_buffer); |
1810 | len -= l; | 1807 | len -= l; |
1811 | if (len == 0) | 1808 | if (len == 0) |