From 206dfa0e8040e01bfc31e5668c3fd677bcade1ca Mon Sep 17 00:00:00 2001
From: bobijam <bobijam>
Date: Thu, 18 Oct 2007 08:22:55 +0000
Subject: [PATCH] Branch HEAD b=13626
reverse the patch since been reported broken test on box with 2G ram.
---
lustre/llite/rw.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index dc99195895..017ec521df 100644
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -169,10 +169,8 @@ void ll_truncate(struct inode *inode)
struct ll_async_page *llap = llap_cast_private(page);
if (llap != NULL) {
llap->llap_checksum =
- crc32_le(0,
- kmap_atomic(page, KM_USER0),
- CFS_PAGE_SIZE);
- kunmap_atomic(page, KM_USER0);
+ crc32_le(0, kmap(page), CFS_PAGE_SIZE);
+ kunmap(page);
}
page_cache_release(page);
}
@@ -269,8 +267,8 @@ int ll_prepare_write(struct file *file, struct page *page, unsigned from,
if (lvb.lvb_size <= offset) {
LL_CDEBUG_PAGE(D_PAGE, page, "kms "LPU64" <= offset "LPU64"\n",
lvb.lvb_size, offset);
- memset(kmap_atomic(page, KM_USER0), 0, CFS_PAGE_SIZE);
- kunmap_atomic(page, KM_USER0);
+ memset(kmap(page), 0, CFS_PAGE_SIZE);
+ kunmap(page);
GOTO(prepare_done, rc = 0);
}
@@ -643,9 +641,8 @@ struct ll_async_page *llap_from_page(struct page *page, unsigned origin)
out:
if (unlikely(sbi->ll_flags & LL_SBI_CHECKSUM)) {
__u32 csum = 0;
- csum = crc32_le(csum, kmap_atomic(page, KM_USER0),
- CFS_PAGE_SIZE);
- kunmap_atomic(page, KM_USER0);
+ csum = crc32_le(csum, kmap(page), CFS_PAGE_SIZE);
+ kunmap(page);
if (origin == LLAP_ORIGIN_READAHEAD ||
origin == LLAP_ORIGIN_READPAGE) {
llap->llap_checksum = 0;
@@ -716,9 +713,8 @@ static int queue_or_sync_write(struct obd_export *exp, struct inode *inode,
llap->llap_checksum != 0)) {
__u32 csum = 0;
struct page *page = llap->llap_page;
- csum = crc32_le(csum, kmap_atomic(page, KM_USER0),
- CFS_PAGE_SIZE);
- kunmap_atomic(page, KM_USER0);
+ csum = crc32_le(csum, kmap(page), CFS_PAGE_SIZE);
+ kunmap(page);
if (llap->llap_checksum == csum) {
CDEBUG(D_PAGE, "page %p cksum %x confirmed\n",
page, csum);
--
GitLab