---

yaml --- r: 128502 b: refs/heads/master c: bbf0d00 h: refs/heads/master v: v3
git-mirror · Sep 25, 2008 · 08a8b65 · 08a8b65
1 parent 44df15f
commit 08a8b65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a2118dfd4c328e8823cdcfebf839dff73ac21e9
+refs/heads/master: bbf0d0062da2b3e1e239e381f8ac20971ef1b2ed
diff --git a/trunk/fs/btrfs/inode.c b/trunk/fs/btrfs/inode.c
@@ -168,8 +168,10 @@ 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;
 
 	ret = get_state_private(em_tree, start, &private);
+	local_irq_save(flags);
 	kaddr = kmap_atomic(page, KM_IRQ0);
 	if (ret) {
 		goto zeroit;
@@ -180,6 +182,7 @@ int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end)
 		goto zeroit;
 	}
 	kunmap_atomic(kaddr, KM_IRQ0);
+	local_irq_restore(flags);
 	return 0;
 
 zeroit:
@@ -188,6 +191,7 @@ int btrfs_readpage_end_io_hook(struct page *page, u64 start, u64 end)
 	memset(kaddr + offset, 1, end - start + 1);
 	flush_dcache_page(page);
 	kunmap_atomic(kaddr, KM_IRQ0);
+	local_irq_restore(flags);
 	return 0;
 }