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

LU-2675 lustre: remove linux/lustre_dlm.h

Remove lustre/include/linux/lustre_dlm.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I7895cbe7a42146e4be14a0c36fecd28f642d1cd1
Reviewed-on: http://review.whamcloud.com/11497
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
Tested-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am
index 1aab399..19197ae 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_lib.h \
-	lustre_dlm.h  lustre_handles.h lustre_net.h obd_class.h obd_support.h \
+	lustre_handles.h lustre_net.h obd_class.h obd_support.h \
 	obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \
 	lustre_user.h lustre_patchless_compat.h lustre_intent.h
diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h
deleted file mode 100644
index 4160dc9..0000000
--- a/lustre/include/linux/lustre_dlm.h
+++ /dev/null
@@ -1,46 +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_DLM_H__
-#define _LINUX_LUSTRE_DLM_H__
-
-#ifndef _LUSTRE_DLM_H__
-#error Do not #include this file directly. #include <lprocfs_status.h> instead
-#endif
-
-#include <linux/proc_fs.h>
-#include <asm/processor.h>
-#include <linux/bit_spinlock.h>
-
-#endif
diff --git a/lustre/include/lustre_dlm.h b/lustre/include/lustre_dlm.h
index 2c7b079..a8f5715 100644
--- a/lustre/include/lustre_dlm.h
+++ b/lustre/include/lustre_dlm.h
@@ -48,8 +48,6 @@
 #ifndef _LUSTRE_DLM_H__
 #define _LUSTRE_DLM_H__
 
-#include <linux/lustre_dlm.h>
-
 #include <lustre_lib.h>
 #include <lustre_net.h>
 #include <lustre_import.h>