From: John L. Hammond <john.hammond@intel.com>
Date: Mon, 18 Aug 2014 18:33:29 +0000 (-0500)
Subject: LU-2675 lustre: remove linux/lustre_net.h
X-Git-Tag: 2.6.54~15
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=f5070410e2f9979a6301c0f872b06402abb88a9c

LU-2675 lustre: remove linux/lustre_net.h

Remove the (mostly) empty header lustre/include/linux/lustre_net.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I6ad41b94cf21803ac2f6602c5befea511d02937a
Reviewed-on: http://review.whamcloud.com/11503
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index b6759f4..fb240e5 100644
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -43,6 +43,6 @@ linux_HEADERS = lustre_user.h
 endif
 
 EXTRA_DIST = \
-	lustre_net.h obd_class.h obd_support.h \
+	obd_class.h obd_support.h \
 	obd.h lvfs.h lustre_compat25.h lustre_quota.h \
 	lustre_user.h lustre_patchless_compat.h
diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h
deleted file mode 100644
index 6dbd3b5..0000000
--- a/lustre/include/linux/lustre_net.h
+++ /dev/null
@@ -1,45 +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/version.h>
-#include <linux/workqueue.h>
-
-#endif
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index e55f42a..a61a02c 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -55,7 +55,6 @@
  * @{
  */
 
-#include <linux/lustre_net.h>
 #include <libcfs/libcfs.h>
 #include <lnet/lnet.h>
 #include <lustre/lustre_idl.h>