LU-2675 lov: remove liblustre includes

Remove liblustre includes from lov/. Remove Darwin cruft from lov
autocrud. Always assume a Linux kernel build.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I181d5f40bc77ff93103d1e5226080232c895c42a
Reviewed-on: http://review.whamcloud.com/10196
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/lov/Info.plist b/lustre/lov/Info.plist
deleted file mode 100644 (file)
index 006f794..0000000
--- a/lustre/lov/Info.plist
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-       <key>CFBundleDevelopmentRegion</key>
-       <string>English</string>
-       <key>CFBundleExecutable</key>
-       <string>lov</string>
-       <key>CFBundleIconFile</key>
-       <string></string>
-       <key>CFBundleIdentifier</key>
-       <string>com.clusterfs.lustre.lov</string>
-       <key>CFBundleInfoDictionaryVersion</key>
-       <string>6.0</string>
-       <key>CFBundlePackageType</key>
-       <string>KEXT</string>
-       <key>CFBundleSignature</key>
-       <string>????</string>
-       <key>CFBundleVersion</key>
-       <string>1.0.1</string>
-        <key>OSBundleCompatibleVersion</key>
-        <string>1.0.0</string>
-       <key>OSBundleLibraries</key>
-       <dict>
-               <key>com.apple.kpi.bsd</key>
-               <string>8.0.0b1</string>
-               <key>com.apple.kpi.libkern</key>
-               <string>8.0.0b1</string>
-               <key>com.apple.kpi.mach</key>
-               <string>8.0.0b1</string>
-               <key>com.clusterfs.lustre.libcfs</key>
-               <string>1.0.0</string>
-               <key>com.clusterfs.lustre.lvfs</key>
-               <string>1.0.0</string>
-               <key>com.clusterfs.lustre.obdclass</key>
-               <string>1.0.0</string>
-               <key>com.clusterfs.lustre.ptlrpc</key>
-               <string>1.0.0</string>
-       </dict>
-</dict>
-</plist>

diff --git a/lustre/lov/autoMakefile.am b/lustre/lov/autoMakefile.am
index 7dc578e..0b698a0 100644 (file)
--- a/lustre/lov/autoMakefile.am
+++ b/lustre/lov/autoMakefile.am
@@ -36,69 +36,8 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-if LIBLUSTRE
-noinst_LIBRARIES = liblov.a
-liblov_a_SOURCES = lov_cl_internal.h \
-        lov_internal.h \
-        lov_dev.c \
-        lov_ea.c \
-        lov_io.c \
-        lov_lock.c \
-        lov_merge.c \
-        lov_obd.c \
-        lov_object.c \
-        lov_offset.c \
-        lov_pack.c \
-        lov_page.c \
-        lov_pool.c \
-        lov_request.c \
-        lovsub_dev.c \
-        lovsub_io.c \
-        lovsub_lock.c \
-        lovsub_object.c \
-        lovsub_page.c
-
-liblov_a_CPPFLAGS = $(LLCPPFLAGS)
-liblov_a_CFLAGS = $(LLCFLAGS)
-endif
-
 if MODULES
-if LINUX
 modulefs_DATA = lov$(KMODEXT)
-endif
-
-if DARWIN
-macos_PROGRAMS = lov
-
-lov_SOURCES =          \
-       lov_pool.c      \
-       lov_obd.c       \
-       lov_pack.c      \
-       lov_request.c   \
-       lov_merge.c     \
-       lov_dev.c       \
-       lov_object.c    \
-       lov_page.c      \
-       lov_lock.c      \
-       lov_io.c        \
-       lovsub_dev.c    \
-       lovsub_object.c \
-       lovsub_page.c   \
-       lovsub_lock.c   \
-       lovsub_io.c     \
-       lov_offset.c    \
-       lov_internal.h
-
-lov_CFLAGS := $(EXTRA_KCFLAGS)
-lov_LDFLAGS := $(EXTRA_KLDFLAGS)
-lov_LDADD := $(EXTRA_KLIBS)
-
-plist_DATA = Info.plist
-
-install_data_hook = fix-kext-ownership
-
-endif # DARWIN
-
 endif # MODULES
 
 install-data-hook: $(install_data_hook)

diff --git a/lustre/lov/lov_cl_internal.h b/lustre/lov/lov_cl_internal.h
index 9635e99..e9d28f8 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -46,12 +46,7 @@
 #ifndef LOV_CL_INTERNAL_H
 #define LOV_CL_INTERNAL_H
 
-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-#else
-# include <liblustre.h>
-#endif
-
+#include <libcfs/libcfs.h>
 #include <obd.h>
 #include <cl_object.h>
 #include "lov_internal.h"

diff --git a/lustre/lov/lov_ea.c b/lustre/lov/lov_ea.c
index 462f39b..619c742 100644 (file)
--- a/lustre/lov/lov_ea.c
+++ b/lustre/lov/lov_ea.c
@@ -40,12 +40,8 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <linux/math64.h>
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>

diff --git a/lustre/lov/lov_merge.c b/lustre/lov/lov_merge.c
index fd74179..7362ead 100644 (file)
--- a/lustre/lov/lov_merge.c
+++ b/lustre/lov/lov_merge.c
@@ -36,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 #include "lov_internal.h"
@@ -63,9 +59,7 @@ int lov_merge_lvb_kms(struct lov_stripe_md *lsm,
        int rc = 0;
 
        assert_spin_locked(&lsm->lsm_lock);
-#ifdef __KERNEL__
        LASSERT(lsm->lsm_lock_owner == current_pid());
-#endif
 
        CDEBUG(D_INODE, "MDT ID "DOSTID" initial value: s="LPU64" m="LPU64
               " a="LPU64" c="LPU64" b="LPU64"\n", POSTID(&lsm->lsm_oi),

diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index 7bacb3f..9fafedd 100644 (file)
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -42,11 +42,7 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LOV
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_support.h>
 #include <lustre_ioctl.h>
@@ -2467,7 +2463,6 @@ int __init lov_init(void)
         RETURN(rc);
 }
 
-#ifdef __KERNEL__
 static void /*__exit*/ lov_exit(void)
 {
        class_unregister_type(LUSTRE_LOV_NAME);
@@ -2480,4 +2475,3 @@ MODULE_DESCRIPTION("Lustre Logical Object Volume OBD driver");
 MODULE_LICENSE("GPL");
 
 cfs_module(lov, LUSTRE_VERSION_STRING, lov_init, lov_exit);
-#endif

diff --git a/lustre/lov/lov_offset.c b/lustre/lov/lov_offset.c
index d29e87d..d713907 100644 (file)
--- a/lustre/lov/lov_offset.c
+++ b/lustre/lov/lov_offset.c
@@ -36,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 

diff --git a/lustre/lov/lov_pack.c b/lustre/lov/lov_pack.c
index 3a6f130..bc1aab7 100644 (file)
--- a/lustre/lov/lov_pack.c
+++ b/lustre/lov/lov_pack.c
@@ -41,9 +41,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_LOV
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
 
 #include <lustre_net.h>
 #include <obd.h>

diff --git a/lustre/lov/lov_pool.c b/lustre/lov/lov_pool.c
index 4557bdb..a3c3283 100644 (file)
--- a/lustre/lov/lov_pool.c
+++ b/lustre/lov/lov_pool.c
@@ -44,11 +44,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd.h>
 #include "lov_internal.h"

diff --git a/lustre/lov/lov_request.c b/lustre/lov/lov_request.c
index 0507510..1dc62e4 100644 (file)
--- a/lustre/lov/lov_request.c
+++ b/lustre/lov/lov_request.c
@@ -36,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LOV
 
-#ifdef __KERNEL__
 #include <libcfs/libcfs.h>
-#else
-#include <liblustre.h>
-#endif
 
 #include <obd_class.h>
 #include <lustre/lustre_idl.h>