From a8e627477bfb17515c4e0060b7f5a197cdc6fba2 Mon Sep 17 00:00:00 2001 From: braam Date: Mon, 19 May 2003 06:46:16 +0000 Subject: [PATCH] - GPL licenses in Portals - Remove unused files from Portals - .cvsignore cleanups --- lnet/.cvsignore | 5 ++++ lnet/include/.cvsignore | 1 + lnet/include/lnet/lib-dispatch.h | 1 - lnet/libcfs/Makefile.am | 4 +-- lnet/lnet/Makefile.am | 2 +- lnet/lnet/api-eq.c | 19 ++++++-------- lnet/lnet/api-errno.c | 20 +-------------- lnet/lnet/api-init.c | 18 ++++++------- lnet/lnet/api-md.c | 9 ------- lnet/lnet/api-wrap.c | 18 ++++++------- lnet/lnet/lib-dispatch.c | 17 ++++++------ lnet/lnet/lib-msg.c | 16 ++++++------ lnet/lnet/lib-ni.c | 16 ++++++------ lnet/lnet/lib-not-impl.c | 37 --------------------------- lnet/lnet/lib-pid.c | 19 ++++++++++++++ lustre/portals/.cvsignore | 5 ++++ lustre/portals/include/.cvsignore | 1 + lustre/portals/include/portals/lib-dispatch.h | 1 - lustre/portals/libcfs/Makefile.am | 4 +-- lustre/portals/portals/Makefile.am | 2 +- lustre/portals/portals/api-eq.c | 19 ++++++-------- lustre/portals/portals/api-errno.c | 20 +-------------- lustre/portals/portals/api-init.c | 18 ++++++------- lustre/portals/portals/api-md.c | 9 ------- lustre/portals/portals/api-wrap.c | 18 ++++++------- lustre/portals/portals/lib-dispatch.c | 17 ++++++------ lustre/portals/portals/lib-msg.c | 16 ++++++------ lustre/portals/portals/lib-ni.c | 16 ++++++------ lustre/portals/portals/lib-not-impl.c | 37 --------------------------- lustre/portals/portals/lib-pid.c | 19 ++++++++++++++ 30 files changed, 154 insertions(+), 250 deletions(-) delete mode 100644 lnet/lnet/api-md.c delete mode 100644 lnet/lnet/lib-not-impl.c delete mode 100644 lustre/portals/portals/api-md.c delete mode 100644 lustre/portals/portals/lib-not-impl.c diff --git a/lnet/.cvsignore b/lnet/.cvsignore index cd1dd4f..99ac885 100644 --- a/lnet/.cvsignore +++ b/lnet/.cvsignore @@ -1,3 +1,8 @@ Kernelenv Makefile Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure diff --git a/lnet/include/.cvsignore b/lnet/include/.cvsignore index 5e771c8..d45f796 100644 --- a/lnet/include/.cvsignore +++ b/lnet/include/.cvsignore @@ -1,3 +1,4 @@ config.h stamp-h +stamp-h1 stamp-h.in diff --git a/lnet/include/lnet/lib-dispatch.h b/lnet/include/lnet/lib-dispatch.h index 7e5d73d..f87ff83 100644 --- a/lnet/include/lnet/lib-dispatch.h +++ b/lnet/include/lnet/lib-dispatch.h @@ -37,7 +37,6 @@ extern int do_PtlEQAlloc_internal(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlEQFree_internal(nal_cb_t * nal, void *private, void *args, void *ret); -extern int do_PtlACEntry(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlPut(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlGet(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlFailNid (nal_cb_t *nal, void *private, void *args, void *ret); diff --git a/lnet/libcfs/Makefile.am b/lnet/libcfs/Makefile.am index e2e11af..20d7fbd 100644 --- a/lnet/libcfs/Makefile.am +++ b/lnet/libcfs/Makefile.am @@ -8,8 +8,8 @@ MODULE = portals modulenet_DATA = portals.o EXTRA_PROGRAMS = portals -LIBLINKS := lib-dispatch.c lib-eq.c lib-init.c lib-md.c lib-me.c lib-move.c lib-msg.c lib-ni.c lib-not-impl.c lib-pid.c -APILINKS := api-eq.c api-errno.c api-init.c api-md.c api-me.c api-ni.c api-wrap.c +LIBLINKS := lib-dispatch.c lib-eq.c lib-init.c lib-md.c lib-me.c lib-move.c lib-msg.c lib-ni.c lib-pid.c +APILINKS := api-eq.c api-errno.c api-init.c api-me.c api-ni.c api-wrap.c LINKS = $(APILINKS) $(LIBLINKS) DISTCLEANFILES = $(LINKS) link-stamp *.orig *.rej diff --git a/lnet/lnet/Makefile.am b/lnet/lnet/Makefile.am index 9fb7f6f..8c03749 100644 --- a/lnet/lnet/Makefile.am +++ b/lnet/lnet/Makefile.am @@ -7,4 +7,4 @@ CPPFLAGS= INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include lib_LIBRARIES= libportals.a -libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-md.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-not-impl.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c +libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c diff --git a/lnet/lnet/api-eq.c b/lnet/lnet/api-eq.c index 57427f6..e066619 100644 --- a/lnet/lnet/api-eq.c +++ b/lnet/lnet/api-eq.c @@ -7,23 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * PtlMDUpdate is here so that it can access the per-eventq - * structures. */ #include diff --git a/lnet/lnet/api-errno.c b/lnet/lnet/api-errno.c index 5cb0980..026c93b 100644 --- a/lnet/lnet/api-errno.c +++ b/lnet/lnet/api-errno.c @@ -4,27 +4,9 @@ * api/api-errno.c * Instantiate the string table of errors * - * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories - * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ - * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. - * - * Portals 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * This file is part of Lustre, http://www.sf.net/projects/lustre/ */ -#include - /* If you change these, you must update the number table in portals/errno.h */ const char *ptl_err_str[] = { "PTL_OK", diff --git a/lnet/lnet/api-init.c b/lnet/lnet/api-init.c index b54f684..e59c922 100644 --- a/lnet/lnet/api-init.c +++ b/lnet/lnet/api-init.c @@ -7,22 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * All handles have their interface number stored in the second 16 bit word */ #include diff --git a/lnet/lnet/api-md.c b/lnet/lnet/api-md.c deleted file mode 100644 index 967112f..0000000 --- a/lnet/lnet/api-md.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * api-p30/md.c - * - * Memory descriptor functions that need address validation - * There are a few standing issues... - * - Addresses are invalidated by the library without telling us. - */ -#include - diff --git a/lnet/lnet/api-wrap.c b/lnet/lnet/api-wrap.c index cbd4d1f..e54707f 100644 --- a/lnet/lnet/api-wrap.c +++ b/lnet/lnet/api-wrap.c @@ -7,22 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Assumes the handle encodes the network number in the second 16 bit word */ # define DEBUG_SUBSYSTEM S_PORTALS diff --git a/lnet/lnet/lib-dispatch.c b/lnet/lnet/lib-dispatch.c index 63ed70f..13036c7 100644 --- a/lnet/lnet/lib-dispatch.c +++ b/lnet/lnet/lib-dispatch.c @@ -6,19 +6,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -47,7 +47,6 @@ static dispatch_table_t dispatch_table[] = { [PTL_MDUNLINK] {do_PtlMDUnlink, "PtlMDUnlink"}, [PTL_EQALLOC] {do_PtlEQAlloc_internal, "PtlEQAlloc_internal"}, [PTL_EQFREE] {do_PtlEQFree_internal, "PtlEQFree_internal"}, - [PTL_ACENTRY] {do_PtlACEntry, "PtlACEntry"}, [PTL_PUT] {do_PtlPut, "PtlPut"}, [PTL_GET] {do_PtlGet, "PtlGet"}, [PTL_FAILNID] {do_PtlFailNid, "PtlFailNid"}, diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index 20a6c66..f10892c 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -7,19 +7,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/lnet/lnet/lib-ni.c b/lnet/lnet/lib-ni.c index 37dcb91..aa30329 100644 --- a/lnet/lnet/lib-ni.c +++ b/lnet/lnet/lib-ni.c @@ -7,19 +7,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/lnet/lnet/lib-not-impl.c b/lnet/lnet/lib-not-impl.c deleted file mode 100644 index 78959b2..0000000 --- a/lnet/lnet/lib-not-impl.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * lib/lib-not-impl.c - * - * boiler plate functions that can be used to write the - * library side routines - */ - -# define DEBUG_SUBSYSTEM S_PORTALS - -#include -#include - - -int do_PtlACEntry(nal_cb_t * nal, void *private, void *v_args, void *v_ret) -{ - /* - * Incoming: - * ptl_handle_ni_t ni_in - * ptl_ac_index_t index_in - * ptl_process_id_t match_id_in - * ptl_pt_index_t portal_in - - * - * Outgoing: - - */ - - PtlACEntry_in *args = v_args; - PtlACEntry_out *ret = v_ret; - - if (!args) - return ret->rc = PTL_SEGV; - - return ret->rc = PTL_NOT_IMPLEMENTED; -} diff --git a/lnet/lnet/lib-pid.c b/lnet/lnet/lib-pid.c index e00e9f0..12eebb5 100644 --- a/lnet/lnet/lib-pid.c +++ b/lnet/lnet/lib-pid.c @@ -2,7 +2,26 @@ * vim:expandtab:shiftwidth=8:tabstop=8: * * lib/lib-pid.c + * * 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/ + * + * Lustre is free 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. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This should be removed. The NAL should have the PID information */ diff --git a/lustre/portals/.cvsignore b/lustre/portals/.cvsignore index cd1dd4f..99ac885 100644 --- a/lustre/portals/.cvsignore +++ b/lustre/portals/.cvsignore @@ -1,3 +1,8 @@ Kernelenv Makefile Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure diff --git a/lustre/portals/include/.cvsignore b/lustre/portals/include/.cvsignore index 5e771c8..d45f796 100644 --- a/lustre/portals/include/.cvsignore +++ b/lustre/portals/include/.cvsignore @@ -1,3 +1,4 @@ config.h stamp-h +stamp-h1 stamp-h.in diff --git a/lustre/portals/include/portals/lib-dispatch.h b/lustre/portals/include/portals/lib-dispatch.h index 7e5d73d..f87ff83 100644 --- a/lustre/portals/include/portals/lib-dispatch.h +++ b/lustre/portals/include/portals/lib-dispatch.h @@ -37,7 +37,6 @@ extern int do_PtlEQAlloc_internal(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlEQFree_internal(nal_cb_t * nal, void *private, void *args, void *ret); -extern int do_PtlACEntry(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlPut(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlGet(nal_cb_t * nal, void *private, void *args, void *ret); extern int do_PtlFailNid (nal_cb_t *nal, void *private, void *args, void *ret); diff --git a/lustre/portals/libcfs/Makefile.am b/lustre/portals/libcfs/Makefile.am index e2e11af..20d7fbd 100644 --- a/lustre/portals/libcfs/Makefile.am +++ b/lustre/portals/libcfs/Makefile.am @@ -8,8 +8,8 @@ MODULE = portals modulenet_DATA = portals.o EXTRA_PROGRAMS = portals -LIBLINKS := lib-dispatch.c lib-eq.c lib-init.c lib-md.c lib-me.c lib-move.c lib-msg.c lib-ni.c lib-not-impl.c lib-pid.c -APILINKS := api-eq.c api-errno.c api-init.c api-md.c api-me.c api-ni.c api-wrap.c +LIBLINKS := lib-dispatch.c lib-eq.c lib-init.c lib-md.c lib-me.c lib-move.c lib-msg.c lib-ni.c lib-pid.c +APILINKS := api-eq.c api-errno.c api-init.c api-me.c api-ni.c api-wrap.c LINKS = $(APILINKS) $(LIBLINKS) DISTCLEANFILES = $(LINKS) link-stamp *.orig *.rej diff --git a/lustre/portals/portals/Makefile.am b/lustre/portals/portals/Makefile.am index 9fb7f6f..8c03749 100644 --- a/lustre/portals/portals/Makefile.am +++ b/lustre/portals/portals/Makefile.am @@ -7,4 +7,4 @@ CPPFLAGS= INCLUDES=-I$(top_srcdir)/portals/include -I$(top_srcdir)/include lib_LIBRARIES= libportals.a -libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-md.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-not-impl.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c +libportals_a_SOURCES= api-eq.c api-init.c api-me.c api-errno.c api-ni.c api-wrap.c lib-dispatch.c lib-init.c lib-me.c lib-msg.c lib-eq.c lib-md.c lib-move.c lib-ni.c lib-pid.c diff --git a/lustre/portals/portals/api-eq.c b/lustre/portals/portals/api-eq.c index 57427f6..e066619 100644 --- a/lustre/portals/portals/api-eq.c +++ b/lustre/portals/portals/api-eq.c @@ -7,23 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * PtlMDUpdate is here so that it can access the per-eventq - * structures. */ #include diff --git a/lustre/portals/portals/api-errno.c b/lustre/portals/portals/api-errno.c index 5cb0980..026c93b 100644 --- a/lustre/portals/portals/api-errno.c +++ b/lustre/portals/portals/api-errno.c @@ -4,27 +4,9 @@ * api/api-errno.c * Instantiate the string table of errors * - * Copyright (c) 2001-2003 Cluster File Systems, Inc. - * Copyright (c) 2001-2002 Sandia National Laboratories - * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ - * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. - * - * Portals 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 Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * This file is part of Lustre, http://www.sf.net/projects/lustre/ */ -#include - /* If you change these, you must update the number table in portals/errno.h */ const char *ptl_err_str[] = { "PTL_OK", diff --git a/lustre/portals/portals/api-init.c b/lustre/portals/portals/api-init.c index b54f684..e59c922 100644 --- a/lustre/portals/portals/api-init.c +++ b/lustre/portals/portals/api-init.c @@ -7,22 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * All handles have their interface number stored in the second 16 bit word */ #include diff --git a/lustre/portals/portals/api-md.c b/lustre/portals/portals/api-md.c deleted file mode 100644 index 967112f..0000000 --- a/lustre/portals/portals/api-md.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * api-p30/md.c - * - * Memory descriptor functions that need address validation - * There are a few standing issues... - * - Addresses are invalidated by the library without telling us. - */ -#include - diff --git a/lustre/portals/portals/api-wrap.c b/lustre/portals/portals/api-wrap.c index cbd4d1f..e54707f 100644 --- a/lustre/portals/portals/api-wrap.c +++ b/lustre/portals/portals/api-wrap.c @@ -7,22 +7,20 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Assumes the handle encodes the network number in the second 16 bit word */ # define DEBUG_SUBSYSTEM S_PORTALS diff --git a/lustre/portals/portals/lib-dispatch.c b/lustre/portals/portals/lib-dispatch.c index 63ed70f..13036c7 100644 --- a/lustre/portals/portals/lib-dispatch.c +++ b/lustre/portals/portals/lib-dispatch.c @@ -6,19 +6,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -47,7 +47,6 @@ static dispatch_table_t dispatch_table[] = { [PTL_MDUNLINK] {do_PtlMDUnlink, "PtlMDUnlink"}, [PTL_EQALLOC] {do_PtlEQAlloc_internal, "PtlEQAlloc_internal"}, [PTL_EQFREE] {do_PtlEQFree_internal, "PtlEQFree_internal"}, - [PTL_ACENTRY] {do_PtlACEntry, "PtlACEntry"}, [PTL_PUT] {do_PtlPut, "PtlPut"}, [PTL_GET] {do_PtlGet, "PtlGet"}, [PTL_FAILNID] {do_PtlFailNid, "PtlFailNid"}, diff --git a/lustre/portals/portals/lib-msg.c b/lustre/portals/portals/lib-msg.c index 20a6c66..f10892c 100644 --- a/lustre/portals/portals/lib-msg.c +++ b/lustre/portals/portals/lib-msg.c @@ -7,19 +7,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/lustre/portals/portals/lib-ni.c b/lustre/portals/portals/lib-ni.c index 37dcb91..aa30329 100644 --- a/lustre/portals/portals/lib-ni.c +++ b/lustre/portals/portals/lib-ni.c @@ -7,19 +7,19 @@ * Copyright (c) 2001-2003 Cluster File Systems, Inc. * Copyright (c) 2001-2002 Sandia National Laboratories * - * This file is part of Portals, http://www.sf.net/projects/sandiaportals/ + * This file is part of Lustre, http://www.sf.net/projects/lustre/ * - * Portals is free software; you can redistribute it and/or - * modify it under the terms of version 2.1 of the GNU Lesser General - * Public License as published by the Free Software Foundation. + * Lustre is free 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. * - * Portals is distributed in the hope that it will be useful, + * 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 - * GNU Lesser General Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with Portals; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/lustre/portals/portals/lib-not-impl.c b/lustre/portals/portals/lib-not-impl.c deleted file mode 100644 index 78959b2..0000000 --- a/lustre/portals/portals/lib-not-impl.c +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * lib/lib-not-impl.c - * - * boiler plate functions that can be used to write the - * library side routines - */ - -# define DEBUG_SUBSYSTEM S_PORTALS - -#include -#include - - -int do_PtlACEntry(nal_cb_t * nal, void *private, void *v_args, void *v_ret) -{ - /* - * Incoming: - * ptl_handle_ni_t ni_in - * ptl_ac_index_t index_in - * ptl_process_id_t match_id_in - * ptl_pt_index_t portal_in - - * - * Outgoing: - - */ - - PtlACEntry_in *args = v_args; - PtlACEntry_out *ret = v_ret; - - if (!args) - return ret->rc = PTL_SEGV; - - return ret->rc = PTL_NOT_IMPLEMENTED; -} diff --git a/lustre/portals/portals/lib-pid.c b/lustre/portals/portals/lib-pid.c index e00e9f0..12eebb5 100644 --- a/lustre/portals/portals/lib-pid.c +++ b/lustre/portals/portals/lib-pid.c @@ -2,7 +2,26 @@ * vim:expandtab:shiftwidth=8:tabstop=8: * * lib/lib-pid.c + * * 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/ + * + * Lustre is free 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. + * + * 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 + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Lustre; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* This should be removed. The NAL should have the PID information */ -- 1.8.3.1