X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flustre_peer.c;h=507bee23755aee81c9d90b59a46e71eb70f81f28;hb=5801dad47e4727a44b6343a3f7f875d7992f29a3;hp=0d53c7ecc25f0adca3155fb105e395735946c9c4;hpb=10e9bc1b7d37b4c7283310712e316d95c5c9c0ba;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c index 0d53c7e..507bee2 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, Whamcloud, Inc. + * Copyright (c) 2011, 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,9 +32,6 @@ #define DEBUG_SUBSYSTEM S_RPC -#ifndef __KERNEL__ -# include -#endif #include #include #include @@ -50,20 +43,20 @@ #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; +static struct list_head g_uuid_list; +static spinlock_t g_uuid_lock; void class_init_uuidlist(void) { - CFS_INIT_LIST_HEAD(&g_uuid_list); - cfs_spin_lock_init(&g_uuid_lock); + INIT_LIST_HEAD(&g_uuid_list); + spin_lock_init(&g_uuid_lock); } void class_exit_uuidlist(void) @@ -74,24 +67,24 @@ void class_exit_uuidlist(void) 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); @@ -115,8 +108,8 @@ int class_add_uuid(const char *uuid, __u64 nid) 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) { + 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; @@ -133,8 +126,8 @@ int class_add_uuid(const char *uuid, __u64 nid) } } if (!found) - cfs_list_add(&data->un_list, &g_uuid_list); - cfs_spin_unlock(&g_uuid_lock); + 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, @@ -145,48 +138,48 @@ int class_add_uuid(const char *uuid, __u64 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) { - 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; + struct list_head deathrow; + + INIT_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 */ @@ -199,8 +192,8 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 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) { + 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)) @@ -215,7 +208,7 @@ int class_check_uuid(struct obd_uuid *uuid, __u64 nid) } break; } - cfs_spin_unlock (&g_uuid_lock); - RETURN(found); + spin_unlock(&g_uuid_lock); + RETURN(found); } EXPORT_SYMBOL(class_check_uuid);