X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fllite%2Fvvp_dev.c;h=bca4997da0e4ef74c4cbaa81a7647836c87043c3;hb=21ec386df7314348e9d483008648524192b51054;hp=b4032c16703dfa6a0d118517f2bdac15897c47a8;hpb=22a73afe70eaedabe337b8fba0dbd38a5cb19fe0;p=fs%2Flustre-release.git

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index b4032c1..bca4997 100644
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -60,16 +60,10 @@
  * "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;
 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),
@@ -374,7 +368,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                         /* 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);
@@ -383,7 +377,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                                 /* 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);
@@ -400,7 +394,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
 }
 
 #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;                                          \
         }                                                               \
@@ -432,9 +426,6 @@ static void vvp_pgcache_page_show(const struct lu_env *env,
         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 ? "" : "-");
 }
@@ -460,9 +451,9 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
                 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));