From: phil Date: Mon, 20 Dec 2004 17:57:43 +0000 (+0000) Subject: The first pass of some overdue copyright cleanup: X-Git-Tag: v1_7_100~1738 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=cd7e28f9cee1a4888af825c1cb80e2111634d6eb;hp=5399d2eb5b8731b81b86c501fdcf942a7803f60c The first pass of some overdue copyright cleanup: - remove ancient Sandia copyright statements from Portals (our tree has been rewritten so many times that it's not even recognizably the same software) - Remove the LLNL copyright from the qswnal (for the same reason) - Remove our copyright from header files which only implement structures and prototypes, which are widely recognized as non-copyrightable --- diff --git a/lnet/include/lnet/lnetctl.h b/lnet/include/lnet/lnetctl.h index ef52a25..b771690 100644 --- a/lnet/include/lnet/lnetctl.h +++ b/lnet/include/lnet/lnetctl.h @@ -1,8 +1,6 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. - * * This file is part of Portals, http://www.sf.net/projects/lustre/ * * Portals is free software; you can redistribute it and/or diff --git a/lnet/include/lnet/ptlctl.h b/lnet/include/lnet/ptlctl.h index ef52a25..b771690 100644 --- a/lnet/include/lnet/ptlctl.h +++ b/lnet/include/lnet/ptlctl.h @@ -1,8 +1,6 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. - * * This file is part of Portals, http://www.sf.net/projects/lustre/ * * Portals is free software; you can redistribute it and/or diff --git a/lnet/klnds/lolnd/lolnd.h b/lnet/klnds/lolnd/lolnd.h index 9d3d3ff..2beb40d 100644 --- a/lnet/klnds/lolnd/lolnd.h +++ b/lnet/klnds/lolnd/lolnd.h @@ -1,8 +1,6 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2004 Cluster File Systems, Inc. - * * This file is part of Lustre, http://www.lustre.org. * * Lustre is free software; you can redistribute it and/or diff --git a/lnet/klnds/qswlnd/qswlnd.c b/lnet/klnds/qswlnd/qswlnd.c index 5aff4e9..0e8929f 100644 --- a/lnet/klnds/qswlnd/qswlnd.c +++ b/lnet/klnds/qswlnd/qswlnd.c @@ -1,11 +1,8 @@ /* - * Copyright (C) 2002 Cluster File Systems, Inc. + * Copyright (C) 2002-2004 Cluster File Systems, Inc. * Author: Eric Barton * - * Copyright (C) 2002, Lawrence Livermore National Labs (LLNL) - * W. Marcus Miller - Based on ksocknal - * - * This file is part of Portals, http://www.sf.net/projects/lustre/ + * This file is part of Portals, http://www.lustre.org * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c index 7aee376..fe17e6a 100644 --- a/lnet/klnds/qswlnd/qswlnd_cb.c +++ b/lnet/klnds/qswlnd/qswlnd_cb.c @@ -4,10 +4,7 @@ * Copyright (C) 2002 Cluster File Systems, Inc. * Author: Eric Barton * - * Copyright (C) 2002, Lawrence Livermore National Labs (LLNL) - * W. Marcus Miller - Based on ksocknal - * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Portals, http://www.lustre.org * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h index 9cfe858..e0d124d 100644 --- a/lnet/klnds/socklnd/socklnd.h +++ b/lnet/klnds/socklnd/socklnd.h @@ -1,13 +1,12 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2001, 2002 Cluster File Systems, Inc. * Author: Zach Brown * Author: Peter J. Braam * Author: Phil Schwan * Author: Eric Barton * - * This file is part of Portals, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/lnet/lib-eq.c b/lnet/lnet/lib-eq.c index 8ea6fdd..a886ff5 100644 --- a/lnet/lnet/lib-eq.c +++ b/lnet/lnet/lib-eq.c @@ -5,9 +5,8 @@ * Library level Event queue management routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/lnet/lib-init.c b/lnet/lnet/lib-init.c index 9d97bc1..813063a 100644 --- a/lnet/lnet/lib-init.c +++ b/lnet/lnet/lib-init.c @@ -6,9 +6,8 @@ * Called by the NAL when it initializes. Safe to call multiple times. * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -30,9 +29,6 @@ #ifdef __KERNEL__ # include /* for memset() */ # include -# ifdef KERNEL_ADDR_CACHE -# include -# endif #else # include # include diff --git a/lnet/lnet/lib-md.c b/lnet/lnet/lib-md.c index 6deadb8..ce5cb0b 100644 --- a/lnet/lnet/lib-md.c +++ b/lnet/lnet/lib-md.c @@ -5,9 +5,8 @@ * Memory Descriptor management routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index 9665b4f..770e2d3 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -5,9 +5,8 @@ * Match Entry management routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -50,8 +49,6 @@ lib_api_me_attach(nal_t *apinal, if (portal >= tbl->size) return PTL_PT_INDEX_INVALID; - /* Should check for valid matchid, but not yet */ - me = lib_me_alloc (nal); if (me == NULL) return PTL_NO_SPACE; @@ -96,8 +93,6 @@ lib_api_me_insert(nal_t *apinal, if (new_me == NULL) return PTL_NO_SPACE; - /* Should check for valid matchid, but not yet */ - LIB_LOCK(nal, flags); current_me = ptl_handle2me(current_meh, nal); diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index d584f1c..ee0f0b4 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -5,9 +5,8 @@ * Data movement routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index 54e89bc..4d17c7d 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -5,9 +5,8 @@ * Message decoding, parsing and finalizing routines * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/lnet/lib-ni.c b/lnet/lnet/lib-ni.c index 0f298a0..7508674 100644 --- a/lnet/lnet/lib-ni.c +++ b/lnet/lnet/lib-ni.c @@ -5,9 +5,8 @@ * Network status registers and distance functions. * * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -26,41 +25,10 @@ #define DEBUG_SUBSYSTEM S_PORTALS #include -#define MAX_DIST 18446744073709551615ULL - int lib_api_ni_status (nal_t *apinal, ptl_sr_index_t sr_idx, ptl_sr_value_t *status) { - lib_nal_t *nal = apinal->nal_data; - lib_ni_t *ni = &nal->libnal_ni; - lib_counters_t *count = &ni->ni_counters; - - switch (sr_idx) { - case PTL_SR_DROP_COUNT: - *status = count->drop_count; - return PTL_OK; - case PTL_SR_DROP_LENGTH: - *status = count->drop_length; - return PTL_OK; - case PTL_SR_RECV_COUNT: - *status = count->recv_count; - return PTL_OK; - case PTL_SR_RECV_LENGTH: - *status = count->recv_length; - return PTL_OK; - case PTL_SR_SEND_COUNT: - *status = count->send_count; - return PTL_OK; - case PTL_SR_SEND_LENGTH: - *status = count->send_length; - return PTL_OK; - case PTL_SR_MSGS_MAX: - *status = count->msgs_max; - return PTL_OK; - default: - *status = 0; - return PTL_SR_INDEX_INVALID; - } + return PTL_FAIL; } diff --git a/lnet/lnet/lib-pid.c b/lnet/lnet/lib-pid.c index ff2a601..5197308 100644 --- a/lnet/lnet/lib-pid.c +++ b/lnet/lnet/lib-pid.c @@ -5,10 +5,8 @@ * * Process identification routines * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * Copyright (C) 2001-2003 Cluster File Systems, Inc. - * * - * This file is part of Lustre, http://www.sf.net/projects/lustre/ + * This file is part of Lustre, http://www.lustre.org * * Lustre is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public diff --git a/lnet/router/router.h b/lnet/router/router.h index 27e4983..af3c966 100644 --- a/lnet/router/router.h +++ b/lnet/router/router.h @@ -1,10 +1,7 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002 Cluster File Systems, Inc. - * - * This file is part of Portals - * http://sourceforge.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.lustre.org * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public