luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Btrfs: Don't use kmap_atomic(..., KM_IRQ0) during checksum verifies

Browse Source 
Checksum verification happens in a helper thread, and there is no
need to mess with interrupts.  This switches to kmap() instead.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Chris Mason 2009-01-06 13:26:40 -05:00
parent 07d400a6df
commit cc7172defc
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/inode.c
View File

@ -1727,7 +1727,6 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
int ret;
struct btrfs_root *root = BTRFS_I(inode)->root;
u32 csum = ~(u32)0;
unsigned long flags;
if (PageChecked(page)) {
ClearPageChecked(page);
@ -1749,8 +1748,7 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
} else {
ret = get_state_private(io_tree, start, &private);
}
local_irq_save(flags);
kaddr = kmap_atomic(page, KM_IRQ0);
kaddr = kmap(page);
if (ret)
goto zeroit;
@ -1759,8 +1757,7 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
if (csum != private)
goto zeroit;
kunmap_atomic(kaddr, KM_IRQ0);
local_irq_restore(flags);
kunmap(page);
good:
/* if the io failure tree for this inode is non-empty,
* check to see if we've recovered from a failed IO
@ -1775,8 +1772,7 @@ static int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end,
(unsigned long long)private);
memset(kaddr + offset, 1, end - start + 1);
flush_dcache_page(page);
kunmap_atomic(kaddr, KM_IRQ0);
local_irq_restore(flags);
kunmap(page);
if (private == 0)
return 0;
return -EIO;