LU-2675 obd: remove linux/obd.h

Remove the now unneeded header lustre/include/linux/obd.h.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I70c0b40fded991b1e871bf8624cb91f39e065ea7
Reviewed-on: http://review.whamcloud.com/13123
Tested-by: Jenkins
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <hpdd-maloo@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 5d21a97..9141de5 100644 (file)
--- a/lustre/include/linux/Makefile.am
+++ b/lustre/include/linux/Makefile.am
@@ -43,5 +43,5 @@ linux_HEADERS = lustre_user.h
 endif
 
 EXTRA_DIST = \
-       obd.h lvfs.h lustre_compat25.h \
+       lvfs.h lustre_compat25.h \
        lustre_user.h lustre_patchless_compat.h

diff --git a/lustre/include/linux/obd.h b/lustre/include/linux/obd.h
deleted file mode 100644 (file)
index eb497bf..0000000
--- a/lustre/include/linux/obd.h
+++ /dev/null
@@ -1,143 +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) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
- * Use is subject to license terms.
- *
- * Copyright (c) 2011, 2013, Intel Corporation.
- */
-/*
- * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
- */
-
-#ifndef __LINUX_OBD_H
-#define __LINUX_OBD_H
-
-#ifndef __OBD_H
-#error Do not #include this file directly. #include <obd.h> instead
-#endif
-
-#include <obd_support.h>
-
-#include <linux/fs.h>
-#include <linux/list.h>
-#include <linux/sched.h>  /* for struct task_struct, for current.h */
-#include <linux/proc_fs.h>
-#include <linux/mount.h>
-
-#define CLIENT_OBD_LIST_LOCK_DEBUG 1
-
-typedef struct {
-       spinlock_t              lock;
-
-#ifdef CLIENT_OBD_LIST_LOCK_DEBUG
-       unsigned long       time;
-       struct task_struct *task;
-       const char         *func;
-       int                 line;
-#endif
-} client_obd_lock_t;
-
-#ifdef CLIENT_OBD_LIST_LOCK_DEBUG
-static inline void __client_obd_list_lock(client_obd_lock_t *lock,
-                                         const char *func, int line)
-{
-       unsigned long cur = jiffies;
-       while (1) {
-               if (spin_trylock(&lock->lock)) {
-                       LASSERT(lock->task == NULL);
-                       lock->task = current;
-                       lock->func = func;
-                       lock->line = line;
-                       lock->time = jiffies;
-                       break;
-               }
-
-               if ((jiffies - cur > msecs_to_jiffies(5 * MSEC_PER_SEC)) &&
-                   (jiffies - lock->time >
-                    msecs_to_jiffies(5 * MSEC_PER_SEC))) {
-                       struct task_struct *task = lock->task;
-
-                       if (task == NULL)
-                               continue;
-
-                       LCONSOLE_WARN("%s:%d: lock %p was acquired"
-                                     " by <%s:%d:%s:%d> for %lu seconds.\n",
-                                     current->comm, current->pid,
-                                     lock, task->comm, task->pid,
-                                     lock->func, lock->line,
-                                     jiffies_to_msecs(jiffies - lock->time) /
-                                     MSEC_PER_SEC);
-                       LCONSOLE_WARN("====== for process holding the "
-                                     "lock =====\n");
-                       libcfs_debug_dumpstack(task);
-                       LCONSOLE_WARN("====== for current process =====\n");
-                       libcfs_debug_dumpstack(NULL);
-                       LCONSOLE_WARN("====== end =======\n");
-                       cfs_pause(msecs_to_jiffies(1000 * MSEC_PER_SEC));
-               }
-               cpu_relax();
-       }
-}
-
-#define client_obd_list_lock(lock) \
-        __client_obd_list_lock(lock, __FUNCTION__, __LINE__)
-
-static inline void client_obd_list_unlock(client_obd_lock_t *lock)
-{
-       LASSERT(lock->task != NULL);
-       lock->task = NULL;
-       lock->time = jiffies;
-       spin_unlock(&lock->lock);
-}
-
-#else /* CLIENT_OBD_LIST_LOCK_DEBUG */
-static inline void client_obd_list_lock(client_obd_lock_t *lock)
-{
-       spin_lock(&lock->lock);
-}
-
-static inline void client_obd_list_unlock(client_obd_lock_t *lock)
-{
-       spin_unlock(&lock->lock);
-}
-
-#endif /* !CLIENT_OBD_LIST_LOCK_DEBUG */
-
-static inline void client_obd_list_lock_init(client_obd_lock_t *lock)
-{
-       spin_lock_init(&lock->lock);
-}
-
-static inline void client_obd_list_lock_done(client_obd_lock_t *lock)
-{}
-
-#ifndef HAVE_ADLER
-/* zlib_adler() is an inline function defined in zutil.h */
-# define HAVE_ADLER
-#endif /* !HAVE_ADLER */
-#endif /* __LINUX_OBD_H */

diff --git a/lustre/include/obd.h b/lustre/include/obd.h
index d6a60c1..33e0a16 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -38,7 +38,6 @@
 #define __OBD_H
 
 #include <linux/spinlock.h>
-#include <linux/obd.h>
 
 #include <lustre/lustre_idl.h>
 #include <lustre_lib.h>