LU-10769 osd-zfs: fix deadlock on osd_object::oo_guard

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

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index 61b8bb9..0ceee42 100644 (file)
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -57,7 +53,6 @@
  */
 
 static struct kmem_cache *ll_thread_kmem;
-struct kmem_cache *vvp_lock_kmem;
 struct kmem_cache *vvp_object_kmem;
 static struct kmem_cache *vvp_session_kmem;
 static struct kmem_cache *vvp_thread_kmem;
@@ -69,11 +64,6 @@ static struct lu_kmem_descr vvp_caches[] = {
                .ckd_size  = sizeof(struct ll_thread_info),
        },
        {
-               .ckd_cache = &vvp_lock_kmem,
-               .ckd_name  = "vvp_lock_kmem",
-               .ckd_size  = sizeof(struct vvp_lock),
-       },
-       {
                .ckd_cache = &vvp_object_kmem,
                .ckd_name  = "vvp_object_kmem",
                .ckd_size  = sizeof(struct vvp_object),
@@ -396,11 +386,11 @@ struct vvp_pgcache_id {
 
 static void vvp_pgcache_id_unpack(loff_t pos, struct vvp_pgcache_id *id)
 {
-        CLASSERT(sizeof(pos) == sizeof(__u64));
+       CLASSERT(sizeof(pos) == sizeof(__u64));
 
-        id->vpi_index  = pos & 0xffffffff;
-        id->vpi_depth  = (pos >> PGC_DEPTH_SHIFT) & 0xf;
-        id->vpi_bucket = ((unsigned long long)pos >> PGC_OBJ_SHIFT);
+       id->vpi_index  = pos & 0xffffffff;
+       id->vpi_depth  = (pos >> PGC_DEPTH_SHIFT) & 0xf;
+       id->vpi_bucket = ((unsigned long long)pos >> PGC_OBJ_SHIFT);
 }
 
 static loff_t vvp_pgcache_id_pack(struct vvp_pgcache_id *id)
@@ -481,7 +471,7 @@ static loff_t vvp_pgcache_find(const struct lu_env *env,
                                id.vpi_index = vmpage->index;
                                /* Cant support over 16T file */
                                nr = !(vmpage->index > 0xffffffff);
-                               page_cache_release(vmpage);
+                               put_page(vmpage);
                        }
 
                        lu_object_ref_del(&clob->co_lu, "dump", current);
@@ -562,7 +552,7 @@ static int vvp_pgcache_show(struct seq_file *f, void *v)
                                page = cl_vmpage_page(vmpage, clob);
                                unlock_page(vmpage);
 
-                               page_cache_release(vmpage);
+                               put_page(vmpage);
                        }
 
                        seq_printf(f, "%8x@"DFID": ", id.vpi_index,