Commit 48186028 authored by John L. Hammond's avatar John L. Hammond Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove linux/lustre_net.h 



Remove the superfluous header lustre/include/linux/lustre_net.h.

Signed-off-by: default avatarJohn L. Hammond <john.hammond@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eed766c1

drivers/staging/lustre/lustre/include/linux/lustre_net.h

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
/*

 * 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 <lustre_net.h> instead

#endif



#include <linux/workqueue.h>



/* XXX Liang: should be moved to other header instead of here */

#ifndef WITH_GROUP_INFO

#define WITH_GROUP_INFO

#endif



#endif

drivers/staging/lustre/lustre/include/lustre_net.h

+0 −2
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ 
 * @{

 */



#include "linux/lustre_net.h"



#include "../../include/linux/libcfs/libcfs.h"

// #include <obd.h>

#include "../../include/linux/lnet/lnet.h"

drivers/staging/lustre/lustre/ptlrpc/service.c

+0 −4
Original line number Diff line number Diff line
@@ -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);