From 3e9b89b33b68018560984e5fcb4e7635b696fa8d Mon Sep 17 00:00:00 2001 From: eeb Date: Thu, 3 Jun 2004 17:01:56 +0000 Subject: [PATCH] * Landing b1_4_eeb_bugfixes - 3162 support for sparse NAL IDs (cray) - 1548 lib_parse error codes - 2667 NAL restructuring to avoid do_forward and fixe locking issues - 2790 allocate optimised REPLY message in thread context - 2287 zero copy elan PUT --- lnet/include/lnet/api-support.h | 5 ----- lnet/lnet/api-me.c | 28 ---------------------------- lustre/portals/include/portals/api-support.h | 5 ----- lustre/portals/portals/api-me.c | 28 ---------------------------- 4 files changed, 66 deletions(-) delete mode 100644 lnet/lnet/api-me.c delete mode 100644 lustre/portals/portals/api-me.c diff --git a/lnet/include/lnet/api-support.h b/lnet/include/lnet/api-support.h index cfae78c..c5994c6 100644 --- a/lnet/include/lnet/api-support.h +++ b/lnet/include/lnet/api-support.h @@ -19,9 +19,4 @@ #include #include -#include -/* Hack for 2.4.18 macro name collision */ -#ifdef yield -#undef yield -#endif diff --git a/lnet/lnet/api-me.c b/lnet/lnet/api-me.c deleted file mode 100644 index 37f0150..0000000 --- a/lnet/lnet/api-me.c +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * api/api-me.c - * Match Entry local operations. - * - * 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/ - * - * 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. - */ - -#define DEBUG_SUBSYSTEM S_PORTALS -#include - diff --git a/lustre/portals/include/portals/api-support.h b/lustre/portals/include/portals/api-support.h index cfae78c..c5994c6 100644 --- a/lustre/portals/include/portals/api-support.h +++ b/lustre/portals/include/portals/api-support.h @@ -19,9 +19,4 @@ #include #include -#include -/* Hack for 2.4.18 macro name collision */ -#ifdef yield -#undef yield -#endif diff --git a/lustre/portals/portals/api-me.c b/lustre/portals/portals/api-me.c deleted file mode 100644 index 37f0150..0000000 --- a/lustre/portals/portals/api-me.c +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * - * api/api-me.c - * Match Entry local operations. - * - * 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/ - * - * 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. - */ - -#define DEBUG_SUBSYSTEM S_PORTALS -#include - -- 1.8.3.1