Whamcloud - gitweb
LU-9679 lustre: use LIST_HEAD() for local lists.
[fs/lustre-release.git] / lustre / obdclass / lustre_peer.c
index 27c8d96..d8dc95a 100644 (file)
@@ -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.
  *
  * 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
  */
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -36,9 +32,6 @@
 
 #define DEBUG_SUBSYSTEM S_RPC
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 #include <obd.h>
 #include <obd_support.h>
 #include <obd_class.h>
 #define NIDS_MAX        32
 
 struct uuid_nid_data {
-        cfs_list_t       un_list;
-        struct obd_uuid  un_uuid;
-        int              un_nid_count;
-        lnet_nid_t       un_nids[NIDS_MAX];
+       struct list_head        un_list;
+       struct obd_uuid         un_uuid;
+       int                     un_nid_count;
+       lnet_nid_t              un_nids[NIDS_MAX];
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
-static cfs_list_t           g_uuid_list;
-static cfs_spinlock_t       g_uuid_lock;
-
-void class_init_uuidlist(void)
-{
-        CFS_INIT_LIST_HEAD(&g_uuid_list);
-        cfs_spin_lock_init(&g_uuid_lock);
-}
-
-void class_exit_uuidlist(void)
-{
-        /* delete all */
-        class_del_uuid(NULL);
-}
+static LIST_HEAD(g_uuid_list);
+static DEFINE_SPINLOCK(g_uuid_lock);
 
 int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index)
 {
-        struct uuid_nid_data *data;
-        struct obd_uuid tmp;
-        int rc = -ENOENT;
-
-        obd_str2uuid(&tmp, uuid);
-        cfs_spin_lock(&g_uuid_lock);
-        cfs_list_for_each_entry(data, &g_uuid_list, un_list) {
-                if (obd_uuid_equals(&data->un_uuid, &tmp)) {
-                        if (index >= data->un_nid_count)
-                                break;
-
-                        rc = 0;
-                        *peer_nid = data->un_nids[index];
-                        break;
-                }
-        }
-        cfs_spin_unlock(&g_uuid_lock);
-        return rc;
+       struct uuid_nid_data *data;
+       struct obd_uuid tmp;
+       int rc = -ENOENT;
+
+       obd_str2uuid(&tmp, uuid);
+       spin_lock(&g_uuid_lock);
+       list_for_each_entry(data, &g_uuid_list, un_list) {
+               if (obd_uuid_equals(&data->un_uuid, &tmp)) {
+                       if (index >= data->un_nid_count)
+                               break;
+
+                       rc = 0;
+                       *peer_nid = data->un_nids[index];
+                       break;
+               }
+       }
+       spin_unlock(&g_uuid_lock);
+       return rc;
 }
+EXPORT_SYMBOL(lustre_uuid_to_peer);
 
 /* Add a nid to a niduuid.  Multiple nids can be added to a single uuid;
    LNET will choose the best one. */
 int class_add_uuid(const char *uuid, __u64 nid)
 {
-        struct uuid_nid_data *data, *entry;
-        int found = 0;
-
-        LASSERT(nid != 0);  /* valid newconfig NID is never zero */
-
-        if (strlen(uuid) > UUID_MAX - 1)
-                return -EOVERFLOW;
-
-        OBD_ALLOC_PTR(data);
-        if (data == NULL)
-                return -ENOMEM;
-
-        obd_str2uuid(&data->un_uuid, uuid);
-        data->un_nids[0] = nid;
-        data->un_nid_count = 1;
-
-        cfs_spin_lock(&g_uuid_lock);
-        cfs_list_for_each_entry(entry, &g_uuid_list, un_list) {
-                if (obd_uuid_equals(&entry->un_uuid, &data->un_uuid)) {
-                        int i;
-
-                        found = 1;
-                        for (i = 0; i < data->un_nid_count; i++)
-                                if (nid == entry->un_nids[i])
-                                        break;
-
-                        if (i == data->un_nid_count) {
-                                LASSERT(data->un_nid_count < NIDS_MAX);
-                                data->un_nids[++data->un_nid_count] = nid;
-                                break;
-                        }
-                }
-        }
-        if (!found)
-                cfs_list_add(&data->un_list, &g_uuid_list);
-        cfs_spin_unlock(&g_uuid_lock);
-
-        if (found) {
-                CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid,
-                       libcfs_nid2str(nid), entry->un_nid_count);
-                OBD_FREE(data, sizeof(*data));
-        } else {
-                CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nid2str(nid));
-        }
-        return 0;
+       struct uuid_nid_data *data, *entry;
+       int found = 0;
+
+       LASSERT(nid != 0);  /* valid newconfig NID is never zero */
+
+       if (strlen(uuid) > UUID_MAX - 1)
+               return -EOVERFLOW;
+
+       OBD_ALLOC_PTR(data);
+       if (data == NULL)
+               return -ENOMEM;
+
+       obd_str2uuid(&data->un_uuid, uuid);
+       data->un_nids[0] = nid;
+       data->un_nid_count = 1;
+
+       spin_lock(&g_uuid_lock);
+       list_for_each_entry(entry, &g_uuid_list, un_list) {
+               if (obd_uuid_equals(&entry->un_uuid, &data->un_uuid)) {
+                       int i;
+
+                       found = 1;
+                       for (i = 0; i < entry->un_nid_count; i++)
+                               if (nid == entry->un_nids[i])
+                                       break;
+
+                       if (i == entry->un_nid_count) {
+                               LASSERT(entry->un_nid_count < NIDS_MAX);
+                               entry->un_nids[entry->un_nid_count++] = nid;
+                       }
+                       break;
+               }
+       }
+       if (!found)
+               list_add(&data->un_list, &g_uuid_list);
+       spin_unlock(&g_uuid_lock);
+
+       if (found) {
+               CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid,
+                      libcfs_nid2str(nid), entry->un_nid_count);
+               OBD_FREE(data, sizeof(*data));
+       } else {
+               CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nid2str(nid));
+       }
+       return 0;
 }
 
 /* Delete the nids for one uuid if specified, otherwise delete all */
 int class_del_uuid(const char *uuid)
 {
-        CFS_LIST_HEAD(deathrow);
-        struct uuid_nid_data *data;
-
-        cfs_spin_lock(&g_uuid_lock);
-        if (uuid != NULL) {
-                struct obd_uuid tmp;
-
-                obd_str2uuid(&tmp, uuid);
-                cfs_list_for_each_entry(data, &g_uuid_list, un_list) {
-                        if (obd_uuid_equals(&data->un_uuid, &tmp)) {
-                                cfs_list_move(&data->un_list, &deathrow);
-                                break;
-                        }
-                }
-        } else
-                cfs_list_splice_init(&g_uuid_list, &deathrow);
-        cfs_spin_unlock(&g_uuid_lock);
-
-        if (uuid != NULL && cfs_list_empty(&deathrow)) {
-                CDEBUG(D_INFO, "Try to delete a non-existent uuid %s\n", uuid);
-                return -EINVAL;
-        }
-
-        while (!cfs_list_empty(&deathrow)) {
-                data = cfs_list_entry(deathrow.next, struct uuid_nid_data,
-                                      un_list);
-                cfs_list_del(&data->un_list);
-
-                CDEBUG(D_INFO, "del uuid %s %s/%d\n",
-                       obd_uuid2str(&data->un_uuid),
-                       libcfs_nid2str(data->un_nids[0]),
-                       data->un_nid_count);
-
-                OBD_FREE(data, sizeof(*data));
-        }
-
-        return 0;
+       struct uuid_nid_data *data;
+       LIST_HEAD(deathrow);
+
+       spin_lock(&g_uuid_lock);
+       if (uuid != NULL) {
+               struct obd_uuid tmp;
+
+               obd_str2uuid(&tmp, uuid);
+               list_for_each_entry(data, &g_uuid_list, un_list) {
+                       if (obd_uuid_equals(&data->un_uuid, &tmp)) {
+                               list_move(&data->un_list, &deathrow);
+                               break;
+                       }
+               }
+       } else
+               list_splice_init(&g_uuid_list, &deathrow);
+       spin_unlock(&g_uuid_lock);
+
+       if (uuid != NULL && list_empty(&deathrow)) {
+               CDEBUG(D_INFO, "Try to delete a non-existent uuid %s\n", uuid);
+               return -EINVAL;
+       }
+
+       while (!list_empty(&deathrow)) {
+               data = list_entry(deathrow.next, struct uuid_nid_data,
+                                 un_list);
+               list_del(&data->un_list);
+
+               CDEBUG(D_INFO, "del uuid %s %s/%d\n",
+                      obd_uuid2str(&data->un_uuid),
+                      libcfs_nid2str(data->un_nids[0]),
+                      data->un_nid_count);
+
+               OBD_FREE(data, sizeof(*data));
+       }
+       return 0;
 }
 
 /* check if @nid exists in nid list of @uuid */
 int class_check_uuid(struct obd_uuid *uuid, __u64 nid)
 {
-        struct uuid_nid_data *entry;
-        int found = 0;
-        ENTRY;
+       struct uuid_nid_data *entry;
+       int found = 0;
+
+       ENTRY;
 
-        CDEBUG(D_INFO, "check if uuid %s has %s.\n",
-               obd_uuid2str(uuid), libcfs_nid2str(nid));
+       CDEBUG(D_INFO, "check if uuid %s has %s.\n",
+              obd_uuid2str(uuid), libcfs_nid2str(nid));
 
-        cfs_spin_lock(&g_uuid_lock);
-        cfs_list_for_each_entry(entry, &g_uuid_list, un_list) {
-                int i;
+       spin_lock(&g_uuid_lock);
+       list_for_each_entry(entry, &g_uuid_list, un_list) {
+               int i;
 
-                if (!obd_uuid_equals(&entry->un_uuid, uuid))
+               if (!obd_uuid_equals(&entry->un_uuid, uuid))
                         continue;
 
-                /* found the uuid, check if it has @nid */
-                for (i = 0; i < entry->un_nid_count; i++) {
-                        if (entry->un_nids[i] == nid) {
-                                found = 1;
-                                break;
-                        }
-                }
-        }
-        cfs_spin_unlock (&g_uuid_lock);
-        RETURN(found);
+               /* found the uuid, check if it has @nid */
+               for (i = 0; i < entry->un_nid_count; i++) {
+                       if (entry->un_nids[i] == nid) {
+                               found = 1;
+                               break;
+                       }
+               }
+               break;
+       }
+       spin_unlock(&g_uuid_lock);
+       RETURN(found);
 }
 EXPORT_SYMBOL(class_check_uuid);