LU-3409 llite: silence lockdep warning in ll_md_blocking_ast

[fs/lustre-release.git] / lustre / llite / vvp_page.c

diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c
index ffb4464..4b85a23 100644 (file)
--- a/lustre/llite/vvp_page.c
+++ b/lustre/llite/vvp_page.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -62,7 +62,6 @@ static void vvp_page_fini_common(struct ccc_page *cp)
 
         LASSERT(vmpage != NULL);
         page_cache_release(vmpage);
-        OBD_SLAB_FREE_PTR(cp, vvp_page_kmem);
 }
 
 static void vvp_page_fini(const struct lu_env *env,
@@ -141,12 +140,14 @@ static void vvp_page_discard(const struct lu_env *env,
                              struct cl_io *unused)
 {
         cfs_page_t           *vmpage  = cl2vm_page(slice);
-        struct address_space *mapping = vmpage->mapping;
+       struct address_space *mapping;
         struct ccc_page      *cpg     = cl2ccc_page(slice);
 
         LASSERT(vmpage != NULL);
         LASSERT(PageLocked(vmpage));
 
+       mapping = vmpage->mapping;
+
         if (cpg->cpg_defer_uptodate && !cpg->cpg_ra_used)
                 ll_ra_stats_inc(mapping, RA_STAT_DISCARDED);
 
@@ -162,10 +163,13 @@ static int vvp_page_unmap(const struct lu_env *env,
                           struct cl_io *unused)
 {
         cfs_page_t *vmpage = cl2vm_page(slice);
-        __u64       offset = vmpage->index << CFS_PAGE_SHIFT;
+       __u64       offset;
 
         LASSERT(vmpage != NULL);
         LASSERT(PageLocked(vmpage));
+
+       offset = vmpage->index << CFS_PAGE_SHIFT;
+
         /*
          * XXX is it safe to call this with the page lock held?
          */
@@ -429,7 +433,6 @@ static void vvp_transient_page_verify(const struct cl_page *page)
        struct inode *inode = ccc_object_inode(page->cp_obj);
 
        LASSERT(!mutex_trylock(&inode->i_mutex));
-       /* LASSERT_SEM_LOCKED(&inode->i_alloc_sem); */
 }
 
 static int vvp_transient_page_own(const struct lu_env *env,
@@ -530,36 +533,30 @@ static const struct cl_page_operations vvp_transient_page_ops = {
         }
 };
 
-struct cl_page *vvp_page_init(const struct lu_env *env, struct cl_object *obj,
-                             struct cl_page *page, cfs_page_t *vmpage)
+int vvp_page_init(const struct lu_env *env, struct cl_object *obj,
+               struct cl_page *page, cfs_page_t *vmpage)
 {
-       struct ccc_page *cpg;
-       int result;
+       struct ccc_page *cpg = cl_object_page_slice(obj, page);
 
        CLOBINVRNT(env, obj, ccc_object_invariant(obj));
 
-       OBD_SLAB_ALLOC_PTR_GFP(cpg, vvp_page_kmem, CFS_ALLOC_IO);
-       if (cpg != NULL) {
-               cpg->cpg_page = vmpage;
-               page_cache_get(vmpage);
-
-               CFS_INIT_LIST_HEAD(&cpg->cpg_pending_linkage);
-               if (page->cp_type == CPT_CACHEABLE) {
-                       SetPagePrivate(vmpage);
-                       vmpage->private = (unsigned long)page;
-                       cl_page_slice_add(page, &cpg->cpg_cl, obj,
-                                         &vvp_page_ops);
-               } else {
-                       struct ccc_object *clobj = cl2ccc(obj);
-
-                       LASSERT(!mutex_trylock(&clobj->cob_inode->i_mutex));
-                       cl_page_slice_add(page, &cpg->cpg_cl, obj,
-                                         &vvp_transient_page_ops);
-                       clobj->cob_transient_pages++;
-               }
-               result = 0;
-       } else
-               result = -ENOMEM;
-       return ERR_PTR(result);
+       cpg->cpg_page = vmpage;
+       page_cache_get(vmpage);
+
+       CFS_INIT_LIST_HEAD(&cpg->cpg_pending_linkage);
+       if (page->cp_type == CPT_CACHEABLE) {
+               SetPagePrivate(vmpage);
+               vmpage->private = (unsigned long)page;
+               cl_page_slice_add(page, &cpg->cpg_cl, obj,
+                               &vvp_page_ops);
+       } else {
+               struct ccc_object *clobj = cl2ccc(obj);
+
+               LASSERT(!mutex_trylock(&clobj->cob_inode->i_mutex));
+               cl_page_slice_add(page, &cpg->cpg_cl, obj,
+                               &vvp_transient_page_ops);
+               clobj->cob_transient_pages++;
+       }
+       return 0;
 }