From 48186028836dfaccc7ce556e1973f6a1b07374eb Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Thu, 28 Aug 2014 18:35:16 -0500 Subject: [PATCH] staging/lustre: remove linux/lustre_net.h Remove the superfluous header lustre/include/linux/lustre_net.h. Signed-off-by: John L. Hammond Signed-off-by: Greg Kroah-Hartman --- .../lustre/lustre/include/linux/lustre_net.h | 49 ------------------- .../lustre/lustre/include/lustre_net.h | 2 - .../staging/lustre/lustre/ptlrpc/service.c | 4 -- 3 files changed, 55 deletions(-) delete mode 100644 drivers/staging/lustre/lustre/include/linux/lustre_net.h diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_net.h b/drivers/staging/lustre/lustre/include/linux/lustre_net.h deleted file mode 100644 index 05de4d87db9a..000000000000 --- a/drivers/staging/lustre/lustre/include/linux/lustre_net.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * 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. - * - * 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). - * - * 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 (c) 2002, 2010, Oracle and/or its affiliates. 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. - */ - -#ifndef _LINUX_LUSTRE_NET_H -#define _LINUX_LUSTRE_NET_H - -#ifndef _LUSTRE_NET_H -#error Do not #include this file directly. #include instead -#endif - -#include - -/* XXX Liang: should be moved to other header instead of here */ -#ifndef WITH_GROUP_INFO -#define WITH_GROUP_INFO -#endif - -#endif diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h index 38b31aaf6fe8..8d58349857cd 100644 --- a/drivers/staging/lustre/lustre/include/lustre_net.h +++ b/drivers/staging/lustre/lustre/include/lustre_net.h @@ -55,8 +55,6 @@ * @{ */ -#include "linux/lustre_net.h" - #include "../../include/linux/libcfs/libcfs.h" // #include #include "../../include/linux/lnet/lnet.h" diff --git a/drivers/staging/lustre/lustre/ptlrpc/service.c b/drivers/staging/lustre/lustre/ptlrpc/service.c index bf325647e81a..160ec3ea22b9 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/service.c +++ b/drivers/staging/lustre/lustre/ptlrpc/service.c @@ -2263,9 +2263,7 @@ static int ptlrpc_main(void *arg) struct ptlrpc_service_part *svcpt = thread->t_svcpt; struct ptlrpc_service *svc = svcpt->scp_service; struct ptlrpc_reply_state *rs; -#ifdef WITH_GROUP_INFO struct group_info *ginfo = NULL; -#endif struct lu_env *env; int counter = 0, rc = 0; @@ -2281,7 +2279,6 @@ static int ptlrpc_main(void *arg) svc->srv_name, thread->t_name, svcpt->scp_cpt); } -#ifdef WITH_GROUP_INFO ginfo = groups_alloc(0); if (!ginfo) { rc = -ENOMEM; @@ -2290,7 +2287,6 @@ static int ptlrpc_main(void *arg) set_current_groups(ginfo); put_group_info(ginfo); -#endif if (svc->srv_ops.so_thr_init != NULL) { rc = svc->srv_ops.so_thr_init(thread); -- 2.39.5