X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fobdclass%2Flustre_peer.c;h=d8dc95ac93171fc4073662ac4a51e50576f0a878;hb=0098396983e1075668414aa5298a4990e61ffbda;hp=46581a5d557d9e109bff0339c933bd7e2f08de08;hpb=8701e7e4b5ec1b34700c95b9b6588f4745730b72;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 46581a5..d8dc95a 100644
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.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) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * 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>
@@ -57,20 +50,8 @@ struct uuid_nid_data {
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
-static struct list_head	g_uuid_list;
-static spinlock_t	g_uuid_lock;
-
-void class_init_uuidlist(void)
-{
-	INIT_LIST_HEAD(&g_uuid_list);
-	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)
 {
@@ -99,61 +80,58 @@ EXPORT_SYMBOL(lustre_uuid_to_peer);
    LNET will choose the best one. */
 int class_add_uuid(const char *uuid, __u64 nid)
 {
-        struct uuid_nid_data *data, *entry;
-        int found = 0;
+	struct uuid_nid_data *data, *entry;
+	int found = 0;
 
-        LASSERT(nid != 0);  /* valid newconfig NID is never zero */
+	LASSERT(nid != 0);  /* valid newconfig NID is never zero */
 
-        if (strlen(uuid) > UUID_MAX - 1)
-                return -EOVERFLOW;
+	if (strlen(uuid) > UUID_MAX - 1)
+		return -EOVERFLOW;
 
-        OBD_ALLOC_PTR(data);
-        if (data == NULL)
-                return -ENOMEM;
+	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;
+	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)
+		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;
+	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;
 }
-EXPORT_SYMBOL(class_add_uuid);
 
 /* Delete the nids for one uuid if specified, otherwise delete all */
 int class_del_uuid(const char *uuid)
 {
 	struct uuid_nid_data *data;
-	struct list_head deathrow;
-
-	INIT_LIST_HEAD(&deathrow);
+	LIST_HEAD(deathrow);
 
 	spin_lock(&g_uuid_lock);
 	if (uuid != NULL) {
@@ -193,29 +171,30 @@ int class_del_uuid(const char *uuid)
 /* 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;
 
-        CDEBUG(D_INFO, "check if uuid %s has %s.\n",
-               obd_uuid2str(uuid), libcfs_nid2str(nid));
+	ENTRY;
+
+	CDEBUG(D_INFO, "check if uuid %s has %s.\n",
+	       obd_uuid2str(uuid), libcfs_nid2str(nid));
 
 	spin_lock(&g_uuid_lock);
 	list_for_each_entry(entry, &g_uuid_list, un_list) {
-                int i;
+		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;
-                        }
-                }
-                break;
-        }
+		/* 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);
 }