RepoMirrors
/
btrfs-progs
mirror of https://github.com/kdave/btrfs-progs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: Refactor sectorsize users in free-space-cache.c 

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
This commit is contained in:
Qu Wenruo 2017-05-18 10:05:22 +08:00 committed by David Sterba
parent db6a1d42b0
commit 4925e1bc11
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
free-space-cache.c
View File

@ -54,7 +54,8 @@ static int io_ctl_init(struct io_ctl *io_ctl, u64 size, u64 ino,
struct btrfs_root *root) struct btrfs_root *root)
{ {
memset(io_ctl, 0, sizeof(struct io_ctl)); memset(io_ctl, 0, sizeof(struct io_ctl));
io_ctl->num_pages = (size + root->sectorsize - 1) / root->sectorsize; io_ctl->num_pages = (size + root->fs_info->sectorsize - 1) /
root->fs_info->sectorsize;
io_ctl->buffer = kzalloc(size, GFP_NOFS); io_ctl->buffer = kzalloc(size, GFP_NOFS);
if (!io_ctl->buffer) if (!io_ctl->buffer)
return -ENOMEM; return -ENOMEM;
@ -81,11 +82,12 @@ static void io_ctl_unmap_page(struct io_ctl *io_ctl)
static void io_ctl_map_page(struct io_ctl *io_ctl, int clear) static void io_ctl_map_page(struct io_ctl *io_ctl, int clear)
{ {
BUG_ON(io_ctl->index >= io_ctl->num_pages); BUG_ON(io_ctl->index >= io_ctl->num_pages);
io_ctl->cur = io_ctl->buffer + (io_ctl->index++ * io_ctl->root->sectorsize); io_ctl->cur = io_ctl->buffer + (io_ctl->index++ *
io_ctl->root->fs_info->sectorsize);
io_ctl->orig = io_ctl->cur; io_ctl->orig = io_ctl->cur;
io_ctl->size = io_ctl->root->sectorsize; io_ctl->size = io_ctl->root->fs_info->sectorsize;
if (clear) if (clear)
memset(io_ctl->cur, 0, io_ctl->root->sectorsize); memset(io_ctl->cur, 0, io_ctl->root->fs_info->sectorsize);
} }
static void io_ctl_drop_pages(struct io_ctl *io_ctl) static void io_ctl_drop_pages(struct io_ctl *io_ctl)
@ -210,7 +212,8 @@ static int io_ctl_check_crc(struct io_ctl *io_ctl, int index)
val = *tmp; val = *tmp;
io_ctl_map_page(io_ctl, 0); io_ctl_map_page(io_ctl, 0);
crc = crc32c(crc, io_ctl->orig + offset, io_ctl->root->sectorsize - offset); crc = crc32c(crc, io_ctl->orig + offset,
io_ctl->root->fs_info->sectorsize - offset);
btrfs_csum_final(crc, (u8 *)&crc); btrfs_csum_final(crc, (u8 *)&crc);
if (val != crc) { if (val != crc) {
printk("btrfs: csum mismatch on free space cache\n"); printk("btrfs: csum mismatch on free space cache\n");
@ -257,7 +260,7 @@ static int io_ctl_read_bitmap(struct io_ctl *io_ctl,
if (ret) if (ret)
return ret; return ret;
memcpy(entry->bitmap, io_ctl->cur, io_ctl->root->sectorsize); memcpy(entry->bitmap, io_ctl->cur, io_ctl->root->fs_info->sectorsize);
io_ctl_unmap_page(io_ctl); io_ctl_unmap_page(io_ctl);
return 0; return 0;