/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
* "llite_" (var. "ll_") prefix.
*/
-cfs_mem_cache_t *vvp_page_kmem;
-cfs_mem_cache_t *vvp_thread_kmem;
-static cfs_mem_cache_t *vvp_session_kmem;
+struct kmem_cache *vvp_thread_kmem;
+static struct kmem_cache *vvp_session_kmem;
static struct lu_kmem_descr vvp_caches[] = {
{
- .ckd_cache = &vvp_page_kmem,
- .ckd_name = "vvp_page_kmem",
- .ckd_size = sizeof (struct ccc_page)
- },
- {
.ckd_cache = &vvp_thread_kmem,
.ckd_name = "vvp_thread_kmem",
.ckd_size = sizeof (struct vvp_thread_info),
};
static void *vvp_key_init(const struct lu_context *ctx,
- struct lu_context_key *key)
+ struct lu_context_key *key)
{
- struct vvp_thread_info *info;
+ struct vvp_thread_info *info;
- OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, CFS_ALLOC_IO);
- if (info == NULL)
- info = ERR_PTR(-ENOMEM);
- return info;
+ OBD_SLAB_ALLOC_PTR_GFP(info, vvp_thread_kmem, __GFP_IO);
+ if (info == NULL)
+ info = ERR_PTR(-ENOMEM);
+ return info;
}
static void vvp_key_fini(const struct lu_context *ctx,
}
static void *vvp_session_key_init(const struct lu_context *ctx,
- struct lu_context_key *key)
+ struct lu_context_key *key)
{
- struct vvp_session *session;
+ struct vvp_session *session;
- OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, CFS_ALLOC_IO);
- if (session == NULL)
- session = ERR_PTR(-ENOMEM);
- return session;
+ OBD_SLAB_ALLOC_PTR_GFP(session, vvp_session_kmem, __GFP_IO);
+ if (session == NULL)
+ session = ERR_PTR(-ENOMEM);
+ return session;
}
static void vvp_session_key_fini(const struct lu_context *ctx,
/* got an object. Find next page. */
hdr = cl_object_header(clob);
- cfs_spin_lock(&hdr->coh_page_guard);
+ spin_lock(&hdr->coh_page_guard);
nr = radix_tree_gang_lookup(&hdr->coh_tree,
(void **)&pg,
id.vpi_index, 1);
/* Cant support over 16T file */
nr = !(pg->cp_index > 0xffffffff);
}
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_unlock(&hdr->coh_page_guard);
lu_object_ref_del(&clob->co_lu, "dump", cfs_current());
cl_object_put(env, clob);
}
#define seq_page_flag(seq, page, flag, has_flags) do { \
- if (cfs_test_bit(PG_##flag, &(page)->flags)) { \
+ if (test_bit(PG_##flag, &(page)->flags)) { \
seq_printf(seq, "%s"#flag, has_flags ? "|" : ""); \
has_flags = 1; \
} \
static void vvp_pgcache_page_show(const struct lu_env *env,
struct seq_file *seq, struct cl_page *page)
{
- struct ccc_page *cpg;
- cfs_page_t *vmpage;
- int has_flags;
+ struct ccc_page *cpg;
+ struct page *vmpage;
+ int has_flags;
cpg = cl2ccc_page(cl_page_at(page, &vvp_device_type));
vmpage = cpg->cpg_page;
seq_page_flag(seq, vmpage, referenced, has_flags);
seq_page_flag(seq, vmpage, uptodate, has_flags);
seq_page_flag(seq, vmpage, dirty, has_flags);
-#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12))
- seq_page_flag(seq, vmpage, highmem, has_flags);
-#endif
seq_page_flag(seq, vmpage, writeback, has_flags);
seq_printf(seq, "%s]\n", has_flags ? "" : "-");
}
if (clob != NULL) {
hdr = cl_object_header(clob);
- cfs_spin_lock(&hdr->coh_page_guard);
- page = cl_page_lookup(hdr, id.vpi_index);
- cfs_spin_unlock(&hdr->coh_page_guard);
+ spin_lock(&hdr->coh_page_guard);
+ page = cl_page_lookup(hdr, id.vpi_index);
+ spin_unlock(&hdr->coh_page_guard);
seq_printf(f, "%8x@"DFID": ",
id.vpi_index, PFID(&hdr->coh_lu.loh_fid));