LU-9312 hsm: add a cookie indexed request hash

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

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index 1d6360e..7a2b9ac 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.c
@@ -14,12 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
- *
- * 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.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -86,7 +82,8 @@ static 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;
@@ -126,7 +123,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;
 
@@ -134,7 +131,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;
@@ -143,7 +140,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,
@@ -322,45 +319,46 @@ void lov_dump_pool(int level, struct pool_desc *pool)
 #define LOV_POOL_INIT_COUNT 2
 int lov_ost_pool_init(struct ost_pool *op, unsigned int count)
 {
-        ENTRY;
+       ENTRY;
 
-        if (count == 0)
-                count = LOV_POOL_INIT_COUNT;
-        op->op_array = NULL;
-        op->op_count = 0;
+       if (count == 0)
+               count = LOV_POOL_INIT_COUNT;
+       op->op_array = NULL;
+       op->op_count = 0;
        init_rwsem(&op->op_rw_sem);
-        op->op_size = count;
-        OBD_ALLOC(op->op_array, op->op_size * sizeof(op->op_array[0]));
-        if (op->op_array == NULL) {
-                op->op_size = 0;
-                RETURN(-ENOMEM);
-        }
-        EXIT;
-        return 0;
+       op->op_size = count * sizeof(op->op_array[0]);
+       OBD_ALLOC(op->op_array, op->op_size);
+       if (op->op_array == NULL) {
+               op->op_size = 0;
+               RETURN(-ENOMEM);
+       }
+       EXIT;
+       return 0;
 }
 
 /* Caller must hold write op_rwlock */
 int lov_ost_pool_extend(struct ost_pool *op, unsigned int min_count)
 {
-        __u32 *new;
-        int new_size;
-
-        LASSERT(min_count != 0);
-
-        if (op->op_count < op->op_size)
-                return 0;
-
-        new_size = max(min_count, 2 * op->op_size);
-        OBD_ALLOC(new, new_size * sizeof(op->op_array[0]));
-        if (new == NULL)
-                return -ENOMEM;
-
-        /* copy old array to new one */
-        memcpy(new, op->op_array, op->op_size * sizeof(op->op_array[0]));
-        OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0]));
-        op->op_array = new;
-        op->op_size = new_size;
-        return 0;
+       __u32 *new;
+       __u32 new_size;
+
+       LASSERT(min_count != 0);
+
+       if (op->op_count * sizeof(op->op_array[0]) < op->op_size)
+               return 0;
+
+       new_size = max_t(__u32, min_count * sizeof(op->op_array[0]),
+                        2 * op->op_size);
+       OBD_ALLOC(new, new_size);
+       if (new == NULL)
+               return -ENOMEM;
+
+       /* copy old array to new one */
+       memcpy(new, op->op_array, op->op_size);
+       OBD_FREE(op->op_array, op->op_size);
+       op->op_array = new;
+       op->op_size = new_size;
+       return 0;
 }
 
 int lov_ost_pool_add(struct ost_pool *op, __u32 idx, unsigned int min_count)
@@ -412,20 +410,20 @@ int lov_ost_pool_remove(struct ost_pool *op, __u32 idx)
 
 int lov_ost_pool_free(struct ost_pool *op)
 {
-        ENTRY;
+       ENTRY;
 
-        if (op->op_size == 0)
-                RETURN(0);
+       if (op->op_size == 0)
+               RETURN(0);
 
        down_write(&op->op_rw_sem);
 
-        OBD_FREE(op->op_array, op->op_size * sizeof(op->op_array[0]));
-        op->op_array = NULL;
-        op->op_count = 0;
-        op->op_size = 0;
+       OBD_FREE(op->op_array, op->op_size);
+       op->op_array = NULL;
+       op->op_count = 0;
+       op->op_size = 0;
 
        up_write(&op->op_rw_sem);
-        RETURN(0);
+       RETURN(0);
 }
 
 
@@ -458,18 +456,18 @@ int lov_pool_new(struct obd_device *obd, char *poolname)
        INIT_HLIST_NODE(&new_pool->pool_hash);
 
 #ifdef CONFIG_PROC_FS
-        /* we need this assert seq_file is not implementated for liblustre */
-        /* get ref for /proc file */
+       /* get ref for /proc file */
         lov_pool_getref(new_pool);
-        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);
+       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);