From e6a067c28f2a786f250d45a8d880ce2e53e090b5 Mon Sep 17 00:00:00 2001
From: pravins <pravins>
Date: Mon, 19 May 2008 15:27:17 +0000
Subject: [PATCH] b=14230 i=amit.sharma i=manoj.joseph
umds cleanup: use libcfs kmap api rather than kernel kmap apis.
---
lustre/cmm/cmm_split.c | 8 ++++----
lustre/mdd/mdd_object.c | 12 ++++++------
lustre/mdt/mdt_handler.c | 13 ++++++-------
3 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/lustre/cmm/cmm_split.c b/lustre/cmm/cmm_split.c
index 33a9657c44..42ca592a8d 100644
--- a/lustre/cmm/cmm_split.c
+++ b/lustre/cmm/cmm_split.c
@@ -480,7 +480,7 @@ static int cmm_split_remove_page(const struct lu_env *env,
ENTRY;
*len = 0;
- kmap(rdpg->rp_pages[0]);
+ cfs_kmap(rdpg->rp_pages[0]);
dp = page_address(rdpg->rp_pages[0]);
for (ent = lu_dirent_start(dp);
ent != NULL && le64_to_cpu(ent->lde_hash) < hash_end;
@@ -505,7 +505,7 @@ static int cmm_split_remove_page(const struct lu_env *env,
*len += sizeof(struct lu_dirpage);
EXIT;
unmap:
- kunmap(rdpg->rp_pages[0]);
+ cfs_kunmap(rdpg->rp_pages[0]);
return rc;
}
@@ -584,13 +584,13 @@ static int cmm_split_process_stripe(const struct lu_env *env,
}
}
- kmap(rdpg->rp_pages[0]);
+ cfs_kmap(rdpg->rp_pages[0]);
ldp = page_address(rdpg->rp_pages[0]);
if (le64_to_cpu(ldp->ldp_hash_end) >= end)
done = 1;
rdpg->rp_hash = le64_to_cpu(ldp->ldp_hash_end);
- kunmap(rdpg->rp_pages[0]);
+ cfs_kunmap(rdpg->rp_pages[0]);
} while (!done);
RETURN(rc);
diff --git a/lustre/mdd/mdd_object.c b/lustre/mdd/mdd_object.c
index 38a1ceb761..5e00c1c679 100644
--- a/lustre/mdd/mdd_object.c
+++ b/lustre/mdd/mdd_object.c
@@ -1440,12 +1440,12 @@ static int __mdd_readpage(const struct lu_env *env, struct mdd_object *obj,
i++, nob -= CFS_PAGE_SIZE) {
LASSERT(i < rdpg->rp_npages);
pg = rdpg->rp_pages[i];
- rc = mdd_dir_page_build(env, !i, kmap(pg),
+ rc = mdd_dir_page_build(env, !i, cfs_kmap(pg),
min_t(int, nob, CFS_PAGE_SIZE), iops,
it, &hash_start, &hash_end, &last);
if (rc != 0 || i == rdpg->rp_npages - 1)
last->lde_reclen = 0;
- kunmap(pg);
+ cfs_kunmap(pg);
}
if (rc > 0) {
/*
@@ -1457,7 +1457,7 @@ static int __mdd_readpage(const struct lu_env *env, struct mdd_object *obj,
if (rc == 0) {
struct lu_dirpage *dp;
- dp = kmap(rdpg->rp_pages[0]);
+ dp = cfs_kmap(rdpg->rp_pages[0]);
dp->ldp_hash_start = rdpg->rp_hash;
dp->ldp_hash_end = hash_end;
if (i == 0)
@@ -1466,7 +1466,7 @@ static int __mdd_readpage(const struct lu_env *env, struct mdd_object *obj,
*/
dp->ldp_flags |= LDF_EMPTY;
dp->ldp_flags = cpu_to_le16(dp->ldp_flags);
- kunmap(rdpg->rp_pages[0]);
+ cfs_kunmap(rdpg->rp_pages[0]);
}
iops->put(env, it);
iops->fini(env, it);
@@ -1504,13 +1504,13 @@ static int mdd_readpage(const struct lu_env *env, struct md_object *obj,
LASSERT(rdpg->rp_pages != NULL);
pg = rdpg->rp_pages[0];
- dp = (struct lu_dirpage*)kmap(pg);
+ dp = (struct lu_dirpage*)cfs_kmap(pg);
memset(dp, 0 , sizeof(struct lu_dirpage));
dp->ldp_hash_start = rdpg->rp_hash;
dp->ldp_hash_end = DIR_END_OFF;
dp->ldp_flags |= LDF_EMPTY;
dp->ldp_flags = cpu_to_le16(dp->ldp_flags);
- kunmap(pg);
+ cfs_kunmap(pg);
GOTO(out_unlock, rc = 0);
}
diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 850271a42e..1c5efc20f2 100644
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1208,7 +1208,7 @@ static int mdt_write_dir_page(struct mdt_thread_info *info, struct page *page,
ma->ma_attr.la_valid = LA_MODE;
ma->ma_valid = MA_INODE;
- kmap(page);
+ cfs_kmap(page);
dp = page_address(page);
offset = (int)((__u32)lu_dirent_start(dp) - (__u32)dp);
@@ -1251,7 +1251,7 @@ static int mdt_write_dir_page(struct mdt_thread_info *info, struct page *page,
}
EXIT;
out:
- kunmap(page);
+ cfs_kunmap(page);
return rc;
}
@@ -3792,7 +3792,7 @@ static void mdt_fini(const struct lu_env *env, struct mdt_device *m)
sptlrpc_rule_set_free(&m->mdt_sptlrpc_rset);
next->md_ops->mdo_init_capa_ctxt(env, next, 0, 0, 0, NULL);
- del_timer(&m->mdt_ck_timer);
+ cfs_timer_disarm(&m->mdt_ck_timer);
mdt_ck_thread_stop(m);
/* finish the stack */
@@ -3991,9 +3991,8 @@ static int mdt_init0(const struct lu_env *env, struct mdt_device *m,
GOTO(err_free_ns, rc);
}
- m->mdt_ck_timer.function = mdt_ck_timer_callback;
- m->mdt_ck_timer.data = (unsigned long)m;
- init_timer(&m->mdt_ck_timer);
+ cfs_timer_init(&m->mdt_ck_timer, mdt_ck_timer_callback, m);
+
rc = mdt_ck_thread_start(m);
if (rc)
GOTO(err_free_ns, rc);
@@ -4031,7 +4030,7 @@ err_fs_cleanup:
target_recovery_fini(obd);
mdt_fs_cleanup(env, m);
err_capa:
- del_timer(&m->mdt_ck_timer);
+ cfs_timer_disarm(&m->mdt_ck_timer);
mdt_ck_thread_stop(m);
err_free_ns:
upcall_cache_cleanup(m->mdt_identity_cache);
--
GitLab