LU-7429 tests: generate dangling name entry properly

[fs/lustre-release.git] / lustre / lov / lov_pool.c

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index a33e90d..9b191b6 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.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) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -44,11 +44,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd.h>
 #include "lov_internal.h"
@@ -62,7 +58,7 @@ static void lov_pool_getref(struct pool_desc *pool)
        atomic_inc(&pool->pool_refcount);
 }
 
-void lov_pool_putref(struct pool_desc *pool) 
+static void lov_pool_putref(struct pool_desc *pool)
 {
        CDEBUG(D_INFO, "pool %p\n", pool);
        if (atomic_dec_and_test(&pool->pool_refcount)) {
@@ -75,7 +71,7 @@ void lov_pool_putref(struct pool_desc *pool)
        }
 }
 
-void lov_pool_putref_locked(struct pool_desc *pool)
+static void lov_pool_putref_locked(struct pool_desc *pool)
 {
        CDEBUG(D_INFO, "pool %p\n", pool);
        LASSERT(atomic_read(&pool->pool_refcount) > 1);
@@ -90,7 +86,8 @@ void lov_pool_putref_locked(struct pool_desc *pool)
  * Chapter 6.4.
  * Addison Wesley, 1973
  */
-static __u32 pool_hashfn(cfs_hash_t *hash_body, const void *key, unsigned mask)
+static __u32 pool_hashfn(struct cfs_hash *hash_body, const void *key,
+                        unsigned mask)
 {
         int i;
         __u32 result;
@@ -130,7 +127,7 @@ static void *pool_hashobject(struct hlist_node *hnode)
        return hlist_entry(hnode, struct pool_desc, pool_hash);
 }
 
-static void pool_hashrefcount_get(cfs_hash_t *hs, struct hlist_node *hnode)
+static void pool_hashrefcount_get(struct cfs_hash *hs, struct hlist_node *hnode)
 {
         struct pool_desc *pool;
 
@@ -138,7 +135,7 @@ static void pool_hashrefcount_get(cfs_hash_t *hs, struct hlist_node *hnode)
         lov_pool_getref(pool);
 }
 
-static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
+static void pool_hashrefcount_put_locked(struct cfs_hash *hs,
                                         struct hlist_node *hnode)
 {
         struct pool_desc *pool;
@@ -147,7 +144,7 @@ static void pool_hashrefcount_put_locked(cfs_hash_t *hs,
         lov_pool_putref_locked(pool);
 }
 
-cfs_hash_ops_t pool_hash_operations = {
+struct cfs_hash_ops pool_hash_operations = {
         .hs_hash        = pool_hashfn,
         .hs_key         = pool_key,
         .hs_keycmp      = pool_hashkey_keycmp,
@@ -157,7 +154,7 @@ cfs_hash_ops_t pool_hash_operations = {
 
 };
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
 /* ifdef needed for liblustre support */
 /*
  * pool /proc seq_file methods
@@ -180,7 +177,7 @@ static void *pool_proc_next(struct seq_file *s, void *v, loff_t *pos)
         struct pool_iterator *iter = (struct pool_iterator *)s->private;
         int prev_idx;
 
-        LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X", iter->magic);
+       LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X\n", iter->magic);
 
         /* test if end of file */
         if (*pos >= pool_tgt_count(iter->pool))
@@ -261,9 +258,9 @@ static int pool_proc_show(struct seq_file *s, void *v)
         struct pool_iterator *iter = (struct pool_iterator *)v;
         struct lov_tgt_desc *tgt;
 
-        LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X", iter->magic);
-        LASSERT(iter->pool != NULL);
-        LASSERT(iter->idx <= pool_tgt_count(iter->pool));
+       LASSERTF(iter->magic == POOL_IT_MAGIC, "%08X\n", iter->magic);
+       LASSERT(iter->pool != NULL);
+       LASSERT(iter->idx <= pool_tgt_count(iter->pool));
 
        down_read(&pool_tgt_rw_sem(iter->pool));
         tgt = pool_tgt(iter->pool, iter->idx);
@@ -299,7 +296,7 @@ static struct file_operations pool_proc_operations = {
         .llseek         = seq_lseek,
         .release        = seq_release,
 };
-#endif /* LPROCFS */
+#endif /* CONFIG_PROC_FS */
 
 void lov_dump_pool(int level, struct pool_desc *pool)
 {
@@ -461,23 +458,19 @@ int lov_pool_new(struct obd_device *obd, char *poolname)
 
        INIT_HLIST_NODE(&new_pool->pool_hash);
 
-#ifdef LPROCFS
-        /* we need this assert seq_file is not implementated for liblustre */
-        /* get ref for /proc file */
+#ifdef CONFIG_PROC_FS
+       /* get ref for /proc file */
         lov_pool_getref(new_pool);
-        new_pool->pool_proc_entry = lprocfs_add_simple(lov->lov_pool_proc_entry,
-                                                       poolname,
-#ifndef HAVE_ONLY_PROCFS_SEQ
-                                                       NULL, NULL,
-#endif
-                                                       new_pool,
-                                                       &pool_proc_operations);
-        if (IS_ERR(new_pool->pool_proc_entry)) {
-                CWARN("Cannot add proc pool entry "LOV_POOLNAMEF"\n", poolname);
-                new_pool->pool_proc_entry = NULL;
-                lov_pool_putref(new_pool);
-        }
-        CDEBUG(D_INFO, "pool %p - proc %p\n", new_pool, new_pool->pool_proc_entry);
+       new_pool->pool_proc_entry = lprocfs_add_simple(lov->lov_pool_proc_entry,
+                                                      poolname, new_pool,
+                                                      &pool_proc_operations);
+       if (IS_ERR(new_pool->pool_proc_entry)) {
+               CWARN("Cannot add proc pool entry "LOV_POOLNAMEF"\n", poolname);
+               new_pool->pool_proc_entry = NULL;
+               lov_pool_putref(new_pool);
+       }
+       CDEBUG(D_INFO, "pool %p - proc %p\n",
+              new_pool, new_pool->pool_proc_entry);
 #endif
 
        spin_lock(&obd->obd_dev_lock);