mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 07:34:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging/lustre: remove linux/lustre_net.h

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

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
John L. Hammond
2014-08-28 18:35:16 -05:00
committed by Greg Kroah-Hartman
parent eed766c163
commit 4818602883
3 changed files with 0 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
drivers/staging/lustre/lustre/include/linux/lustre_net.h
View File

@@ -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 <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

2
drivers/staging/lustre/lustre/include/lustre_net.h
View File

@@ -55,8 +55,6 @@
* @{
*/
#include "linux/lustre_net.h"
#include "../../include/linux/libcfs/libcfs.h"
// #include <obd.h>
#include "../../include/linux/lnet/lnet.h"

4
drivers/staging/lustre/lustre/ptlrpc/service.c
View File

@@ -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);