LU-2675 llite: remove liblustre includes

Remove liblustre includes from llite/. Always assume a kernel build.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I8ed001998869d0ee0b875b80cda9c35c7ad226b5
Reviewed-on: http://review.whamcloud.com/10172
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>

diff --git a/lustre/llite/glimpse.c b/lustre/llite/glimpse.c
index 3bf7261..0aa2469 100644 (file)
--- a/lustre/llite/glimpse.c
+++ b/lustre/llite/glimpse.c
@@ -45,31 +45,15 @@
 #include <obd_support.h>
 #include <obd.h>
 
 #include <obd_support.h>
 #include <obd.h>
 

-#ifdef __KERNEL__
-# include <lustre_dlm.h>
-# include <lustre_lite.h>
-# include <lustre_mdc.h>
-# include <linux/pagemap.h>
-# include <linux/file.h>
-#else
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-#include <fcntl.h>
-#include <liblustre.h>
-#endif
+#include <lustre_dlm.h>
+#include <lustre_lite.h>
+#include <lustre_mdc.h>
+#include <linux/pagemap.h>
+#include <linux/file.h>

 
 #include "cl_object.h"
 #include "lclient.h"
 
 #include "cl_object.h"
 #include "lclient.h"

-#ifdef __KERNEL__
-# include "../llite/llite_internal.h"
-#else
-# include "../liblustre/llite_lib.h"
-#endif
+#include "llite_internal.h"

 
 static const struct cl_lock_descr whole_file = {
         .cld_start = 0,
 
 static const struct cl_lock_descr whole_file = {
         .cld_start = 0,


@@ -86,7 +70,6 @@ static const struct cl_lock_descr whole_file = {
 blkcnt_t dirty_cnt(struct inode *inode)
 {
         blkcnt_t cnt = 0;
 blkcnt_t dirty_cnt(struct inode *inode)
 {
         blkcnt_t cnt = 0;

-#ifdef __KERNEL__

         struct ccc_object *vob = cl_inode2ccc(inode);
         void              *results[1];
 
         struct ccc_object *vob = cl_inode2ccc(inode);
         void              *results[1];
 


@@ -97,7 +80,6 @@ blkcnt_t dirty_cnt(struct inode *inode)
        if (cnt == 0 && atomic_read(&vob->cob_mmap_cnt) > 0)
                cnt = 1;
 
        if (cnt == 0 && atomic_read(&vob->cob_mmap_cnt) > 0)
                cnt = 1;
 

-#endif

         return (cnt > 0) ? 1 : 0;
 }
 
         return (cnt > 0) ? 1 : 0;
 }
 

diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c
index afda860..8d37718 100644 (file)
--- a/lustre/llite/lcommon_cl.c
+++ b/lustre/llite/lcommon_cl.c
@@ -41,26 +41,14 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifdef __KERNEL__
-# include <libcfs/libcfs.h>
-# include <linux/fs.h>
-# include <linux/sched.h>
-# include <linux/mm.h>
-# include <linux/quotaops.h>
-# include <linux/highmem.h>
-# include <linux/pagemap.h>
-# include <linux/rbtree.h>
-#else /* __KERNEL__ */
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-#include <fcntl.h>
-# include <liblustre.h>
-#endif
+#include <libcfs/libcfs.h>
+#include <linux/fs.h>
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/quotaops.h>
+#include <linux/highmem.h>
+#include <linux/pagemap.h>
+#include <linux/rbtree.h>

 
 #include <obd.h>
 #include <obd_support.h>
 
 #include <obd.h>
 #include <obd_support.h>


@@ -73,11 +61,7 @@
 
 #include <lclient.h>
 
 
 #include <lclient.h>
 

-#ifdef __KERNEL__
-#include "../llite/llite_internal.h"
-#else
-#include "../liblustre/llite_lib.h"
-#endif
+#include "llite_internal.h"

 
 static const struct cl_req_operations ccc_req_ops;
 
 
 static const struct cl_req_operations ccc_req_ops;
 


@@ -961,10 +945,8 @@ void ccc_req_attr_set(const struct lu_env *env,
        obdo_set_parent_fid(oa, &cl_i2info(inode)->lli_fid);
        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
                oa->o_parent_oid++;
        obdo_set_parent_fid(oa, &cl_i2info(inode)->lli_fid);
        if (OBD_FAIL_CHECK(OBD_FAIL_LFSCK_INVALID_PFID))
                oa->o_parent_oid++;

-#ifdef __KERNEL__

        memcpy(attr->cra_jobid, cl_i2info(inode)->lli_jobid,
               JOBSTATS_JOBID_SIZE);
        memcpy(attr->cra_jobid, cl_i2info(inode)->lli_jobid,
               JOBSTATS_JOBID_SIZE);

-#endif

 }
 
 static const struct cl_req_operations ccc_req_ops = {
 }
 
 static const struct cl_req_operations ccc_req_ops = {


@@ -1156,9 +1138,7 @@ int cl_file_inode_init(struct inode *inode, struct lustre_md *md)
                  * there is no clob in cache with the given fid, so it is
                  * unnecessary to perform lookup-alloc-lookup-insert, just
                  * alloc and insert directly. */
                  * there is no clob in cache with the given fid, so it is
                  * unnecessary to perform lookup-alloc-lookup-insert, just
                  * alloc and insert directly. */

-#ifdef __KERNEL__

                 LASSERT(inode->i_state & I_NEW);
                 LASSERT(inode->i_state & I_NEW);

-#endif

                 conf.coc_lu.loc_flags = LOC_F_NEW;
                 clob = cl_object_find(env, lu2cl_dev(site->ls_top_dev),
                                       fid, &conf);
                 conf.coc_lu.loc_flags = LOC_F_NEW;
                 clob = cl_object_find(env, lu2cl_dev(site->ls_top_dev),
                                       fid, &conf);

diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 089b39d..f7d8a4c 100644 (file)
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -1337,7 +1337,6 @@ ll_statahead_enter(struct inode *dir, struct dentry **dentryp, int only_unplug)
 }
 
 /* llite ioctl register support rountine */
 }
 
 /* llite ioctl register support rountine */

-#ifdef __KERNEL__

 enum llioc_iter {
         LLIOC_CONT = 0,
         LLIOC_STOP
 enum llioc_iter {
         LLIOC_CONT = 0,
         LLIOC_STOP


@@ -1378,7 +1377,6 @@ typedef enum llioc_iter (*llioc_callback_t)(struct inode *inode,
 void *ll_iocontrol_register(llioc_callback_t cb, int count, unsigned int *cmd);
 void ll_iocontrol_unregister(void *magic);
 
 void *ll_iocontrol_register(llioc_callback_t cb, int count, unsigned int *cmd);
 void ll_iocontrol_unregister(void *magic);
 

-#endif

 
 /* lclient compat stuff */
 #define cl_inode_info ll_inode_info
 
 /* lclient compat stuff */
 #define cl_inode_info ll_inode_info

diff --git a/lustre/llite/vvp_dev.c b/lustre/llite/vvp_dev.c
index ae98455..ac004c0 100644 (file)
--- a/lustre/llite/vvp_dev.c
+++ b/lustre/llite/vvp_dev.c
@@ -41,9 +41,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <obd.h>
 #include <lustre_lite.h>
 
 #include <obd.h>
 #include <lustre_lite.h>

diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h
index b6b749e..334b5b6 100644 (file)
--- a/lustre/llite/vvp_internal.h
+++ b/lustre/llite/vvp_internal.h
@@ -41,9 +41,6 @@
 #ifndef VVP_INTERNAL_H
 #define VVP_INTERNAL_H
 
 #ifndef VVP_INTERNAL_H
 #define VVP_INTERNAL_H
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <cl_object.h>
 #include "llite_internal.h"
 
 #include <cl_object.h>
 #include "llite_internal.h"

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index a342584..77b4049 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -41,9 +41,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <obd.h>
 #include <lustre_lite.h>
 
 #include <obd.h>
 #include <lustre_lite.h>

diff --git a/lustre/llite/vvp_lock.c b/lustre/llite/vvp_lock.c
index 94f85d4..f50adff 100644 (file)
--- a/lustre/llite/vvp_lock.c
+++ b/lustre/llite/vvp_lock.c
@@ -38,9 +38,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <obd.h>
 #include <lustre_lite.h>
 
 #include <obd.h>
 #include <lustre_lite.h>

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 498d3b2..c9c4366 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -40,9 +40,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <libcfs/libcfs.h>
 
 
 #include <libcfs/libcfs.h>
 

diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c
index 41d4975..d031f8b 100644 (file)
--- a/lustre/llite/vvp_page.c
+++ b/lustre/llite/vvp_page.c
@@ -41,9 +41,6 @@
 
 #define DEBUG_SUBSYSTEM S_LLITE
 
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

-#ifndef __KERNEL__
-# error This file is kernel only.
-#endif

 
 #include <obd.h>
 #include <lustre_lite.h>
 
 #include <obd.h>
 #include <lustre_lite.h>