X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Flustre_peer.c;h=d60d0262c8337dae12185a465e14a3c5b2706a01;hb=1a1e988a066cdb4e30599722c7a7f6fdebdb9ccb;hp=fdeef9667a6de299558e5342d74cf7ca371e5c50;hpb=c1f6b32958c799412c830f35f8d16ed7275407ea;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c index fdeef96..d60d026 100644 --- a/lustre/obdclass/lustre_peer.c +++ b/lustre/obdclass/lustre_peer.c @@ -1,26 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (c) 2002, 2003 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_RPC @@ -37,20 +48,20 @@ #include struct uuid_nid_data { - struct list_head un_list; + cfs_list_t un_list; lnet_nid_t un_nid; char *un_uuid; int un_count; /* nid/uuid pair refcount */ }; /* 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; +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); - spin_lock_init(&g_uuid_lock); + cfs_spin_lock_init(&g_uuid_lock); } void class_exit_uuidlist(void) @@ -61,24 +72,24 @@ void class_exit_uuidlist(void) int lustre_uuid_to_peer(const char *uuid, lnet_nid_t *peer_nid, int index) { - struct list_head *tmp; + cfs_list_t *tmp; - spin_lock (&g_uuid_lock); + cfs_spin_lock (&g_uuid_lock); - list_for_each(tmp, &g_uuid_list) { + cfs_list_for_each(tmp, &g_uuid_list) { struct uuid_nid_data *data = - list_entry(tmp, struct uuid_nid_data, un_list); + cfs_list_entry(tmp, struct uuid_nid_data, un_list); if (!strcmp(data->un_uuid, uuid) && index-- == 0) { *peer_nid = data->un_nid; - spin_unlock (&g_uuid_lock); + cfs_spin_unlock (&g_uuid_lock); return 0; } } - spin_unlock (&g_uuid_lock); + cfs_spin_unlock (&g_uuid_lock); return -ENOENT; } @@ -109,9 +120,9 @@ int class_add_uuid(const char *uuid, __u64 nid) data->un_nid = nid; data->un_count = 1; - spin_lock (&g_uuid_lock); + cfs_spin_lock (&g_uuid_lock); - list_for_each_entry(entry, &g_uuid_list, un_list) { + cfs_list_for_each_entry(entry, &g_uuid_list, un_list) { if (entry->un_nid == nid && (strcmp(entry->un_uuid, uuid) == 0)) { found++; @@ -120,8 +131,8 @@ int class_add_uuid(const char *uuid, __u64 nid) } } if (!found) - list_add(&data->un_list, &g_uuid_list); - spin_unlock (&g_uuid_lock); + 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, @@ -141,23 +152,23 @@ int class_del_uuid(const char *uuid) struct uuid_nid_data *data; int found = 0; - spin_lock (&g_uuid_lock); + cfs_spin_lock (&g_uuid_lock); if (uuid == NULL) { - list_splice_init(&g_uuid_list, &deathrow); + cfs_list_splice_init(&g_uuid_list, &deathrow); found = 1; } else { - list_for_each_entry(data, &g_uuid_list, un_list) { + cfs_list_for_each_entry(data, &g_uuid_list, un_list) { if (strcmp(data->un_uuid, uuid)) continue; --data->un_count; LASSERT(data->un_count >= 0); if (data->un_count == 0) - list_move(&data->un_list, &deathrow); + cfs_list_move(&data->un_list, &deathrow); found = 1; break; } } - spin_unlock (&g_uuid_lock); + cfs_spin_unlock (&g_uuid_lock); if (!found) { if (uuid) @@ -165,9 +176,10 @@ int class_del_uuid(const char *uuid) return -EINVAL; } - while (!list_empty(&deathrow)) { - data = list_entry(deathrow.next, struct uuid_nid_data, un_list); - list_del(&data->un_list); + 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\n", data->un_uuid, libcfs_nid2str(data->un_nid));