LU-1364 utils: add lfs 'poollist' subcommand

[fs/lustre-release.git] / lustre / obdclass / lustre_handles.c

diff --git a/lustre/obdclass/lustre_handles.c b/lustre/obdclass/lustre_handles.c
index ec8e51d..4776b27 100644 (file)
--- a/lustre/obdclass/lustre_handles.c
+++ b/lustre/obdclass/lustre_handles.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) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, Whamcloud, Inc.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -62,12 +62,10 @@ static __u64 handle_base;
 static cfs_spinlock_t handle_base_lock;
 
 static struct handle_bucket {
-        cfs_spinlock_t lock;
-        cfs_list_t head;
+        cfs_spinlock_t  lock;
+        cfs_list_t      head;
 } *handle_hash;
 
-static cfs_atomic_t handle_count = CFS_ATOMIC_INIT(0);
-
 #ifdef __arch_um__
 /* For unknown reason, UML uses kmalloc rather than vmalloc to allocate
  * memory(OBD_VMALLOC). Therefore, we have to redefine the
@@ -75,7 +73,7 @@ static cfs_atomic_t handle_count = CFS_ATOMIC_INIT(0);
  */
 #define HANDLE_HASH_SIZE 4096
 #else
-#define HANDLE_HASH_SIZE (1 << 14)
+#define HANDLE_HASH_SIZE (1 << 16)
 #endif /* ifdef __arch_um__ */
 
 #define HANDLE_HASH_MASK (HANDLE_HASH_SIZE - 1)
@@ -84,7 +82,8 @@ static cfs_atomic_t handle_count = CFS_ATOMIC_INIT(0);
  * Generate a unique 64bit cookie (hash) for a handle and insert it into
  * global (per-node) hash-table.
  */
-void class_handle_hash(struct portals_handle *h, portals_handle_addref_cb cb)
+void class_handle_hash(struct portals_handle *h,
+                      struct portals_handle_ops *ops)
 {
         struct handle_bucket *bucket;
         ENTRY;
@@ -110,9 +109,8 @@ void class_handle_hash(struct portals_handle *h, portals_handle_addref_cb cb)
                 handle_base += HANDLE_INCR;
         }
         cfs_spin_unlock(&handle_base_lock);
- 
-        cfs_atomic_inc(&handle_count);
-        h->h_addref = cb;
+
+       h->h_ops = ops;
         cfs_spin_lock_init(&h->h_lock);
 
         bucket = &handle_hash[h->h_cookie & HANDLE_HASH_MASK];
@@ -155,8 +153,6 @@ void class_handle_unhash(struct portals_handle *h)
         cfs_spin_lock(&bucket->lock);
         class_handle_unhash_nolock(h);
         cfs_spin_unlock(&bucket->lock);
-
-        cfs_atomic_dec(&handle_count);
 }
 
 void class_handle_hash_back(struct portals_handle *h)
@@ -166,7 +162,6 @@ void class_handle_hash_back(struct portals_handle *h)
 
         bucket = handle_hash + (h->h_cookie & HANDLE_HASH_MASK);
 
-        cfs_atomic_inc(&handle_count);
         cfs_spin_lock(&bucket->lock);
         list_add_rcu(&h->h_link, &bucket->head);
         h->h_in = 1;
@@ -195,7 +190,7 @@ void *class_handle2object(__u64 cookie)
 
                 cfs_spin_lock(&h->h_lock);
                 if (likely(h->h_in != 0)) {
-                        h->h_addref(h);
+                       h->h_ops->hop_addref(h);
                         retval = h;
                 }
                 cfs_spin_unlock(&h->h_lock);
@@ -208,14 +203,13 @@ void *class_handle2object(__u64 cookie)
 
 void class_handle_free_cb(cfs_rcu_head_t *rcu)
 {
-        struct portals_handle *h = RCU2HANDLE(rcu);
-        if (h->h_free_cb) {
-                h->h_free_cb(h->h_ptr, h->h_size);
-        } else {
-                void *ptr = h->h_ptr;
-                unsigned int size = h->h_size;
-                OBD_FREE(ptr, size);
-        }
+       struct portals_handle *h = RCU2HANDLE(rcu);
+       void *ptr = (void *)(unsigned long)h->h_cookie;
+
+       if (h->h_ops->hop_free != NULL)
+               h->h_ops->hop_free(ptr, h->h_size);
+       else
+               OBD_FREE(ptr, h->h_size);
 }
 
 int class_handle_init(void)
@@ -226,7 +220,7 @@ int class_handle_init(void)
 
         LASSERT(handle_hash == NULL);
 
-        OBD_VMALLOC(handle_hash, sizeof(*bucket) * HANDLE_HASH_SIZE);
+        OBD_ALLOC_LARGE(handle_hash, sizeof(*bucket) * HANDLE_HASH_SIZE);
         if (handle_hash == NULL)
                 return -ENOMEM;
 
@@ -238,32 +232,36 @@ int class_handle_init(void)
         }
 
         /** bug 21430: add randomness to the initial base */
-        ll_get_random_bytes(seed, sizeof(seed));
+        cfs_get_random_bytes(seed, sizeof(seed));
         cfs_gettimeofday(&tv);
-        ll_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
+        cfs_srand(tv.tv_sec ^ seed[0], tv.tv_usec ^ seed[1]);
 
-        ll_get_random_bytes(&handle_base, sizeof(handle_base));
+        cfs_get_random_bytes(&handle_base, sizeof(handle_base));
         LASSERT(handle_base != 0ULL);
 
         return 0;
 }
 
-static void cleanup_all_handles(void)
+static int cleanup_all_handles(void)
 {
+        int rc;
         int i;
 
-        for (i = 0; i < HANDLE_HASH_SIZE; i++) {
+        for (rc = i = 0; i < HANDLE_HASH_SIZE; i++) {
                 struct portals_handle *h;
 
                 cfs_spin_lock(&handle_hash[i].lock);
                 list_for_each_entry_rcu(h, &(handle_hash[i].head), h_link) {
-                        CERROR("force clean handle "LPX64" addr %p addref %p\n",
-                               h->h_cookie, h, h->h_addref);
+                       CERROR("force clean handle "LPX64" addr %p ops %p\n",
+                              h->h_cookie, h, h->h_ops);
 
                         class_handle_unhash_nolock(h);
+                        rc++;
                 }
                 cfs_spin_unlock(&handle_hash[i].lock);
         }
+
+        return rc;
 }
 
 void class_handle_cleanup(void)
@@ -271,15 +269,11 @@ void class_handle_cleanup(void)
         int count;
         LASSERT(handle_hash != NULL);
 
-        count = cfs_atomic_read(&handle_count);
-        if (count != 0) {
-                CERROR("handle_count at cleanup: %d\n", count);
-                cleanup_all_handles();
-        }
+        count = cleanup_all_handles();
 
-        OBD_VFREE(handle_hash, sizeof(*handle_hash) * HANDLE_HASH_SIZE);
+        OBD_FREE_LARGE(handle_hash, sizeof(*handle_hash) * HANDLE_HASH_SIZE);
         handle_hash = NULL;
 
-        if (cfs_atomic_read(&handle_count))
-                CERROR("leaked %d handles\n", cfs_atomic_read(&handle_count));
+        if (count != 0)
+                CERROR("handle_count at cleanup: %d\n", count);
 }