From bd2cd32261669849b901315f296e43f14dabf469 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Wed, 30 Apr 2014 16:28:39 -0500 Subject: [PATCH] LU-2675 llite: remove liblustre includes Remove liblustre includes from llite/. Always assume a kernel build. Signed-off-by: John L. Hammond Change-Id: I8ed001998869d0ee0b875b80cda9c35c7ad226b5 Reviewed-on: http://review.whamcloud.com/10172 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Lai Siyao --- lustre/llite/glimpse.c | 30 ++++++------------------------ lustre/llite/lcommon_cl.c | 38 +++++++++----------------------------- lustre/llite/llite_internal.h | 2 -- lustre/llite/vvp_dev.c | 3 --- lustre/llite/vvp_internal.h | 3 --- lustre/llite/vvp_io.c | 3 --- lustre/llite/vvp_lock.c | 3 --- lustre/llite/vvp_object.c | 3 --- lustre/llite/vvp_page.c | 3 --- 9 files changed, 15 insertions(+), 73 deletions(-) diff --git a/lustre/llite/glimpse.c b/lustre/llite/glimpse.c index 3bf7261..0aa2469 100644 --- a/lustre/llite/glimpse.c +++ b/lustre/llite/glimpse.c @@ -45,31 +45,15 @@ #include #include -#ifdef __KERNEL__ -# include -# include -# include -# include -# include -#else -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif +#include +#include +#include +#include +#include #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, @@ -86,7 +70,6 @@ static const struct cl_lock_descr whole_file = { blkcnt_t dirty_cnt(struct inode *inode) { blkcnt_t cnt = 0; -#ifdef __KERNEL__ 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; -#endif return (cnt > 0) ? 1 : 0; } diff --git a/lustre/llite/lcommon_cl.c b/lustre/llite/lcommon_cl.c index afda860..8d37718 100644 --- a/lustre/llite/lcommon_cl.c +++ b/lustre/llite/lcommon_cl.c @@ -41,26 +41,14 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifdef __KERNEL__ -# include -# include -# include -# include -# include -# include -# include -# include -#else /* __KERNEL__ */ -#include -#include -#include -#include -#include -#include -#include -#include -# include -#endif +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -73,11 +61,7 @@ #include -#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; @@ -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++; -#ifdef __KERNEL__ memcpy(attr->cra_jobid, cl_i2info(inode)->lli_jobid, JOBSTATS_JOBID_SIZE); -#endif } 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. */ -#ifdef __KERNEL__ 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); diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h index 089b39d..f7d8a4c 100644 --- 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 */ -#ifdef __KERNEL__ 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); -#endif /* 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 --- a/lustre/llite/vvp_dev.c +++ b/lustre/llite/vvp_dev.c @@ -41,9 +41,6 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include #include diff --git a/lustre/llite/vvp_internal.h b/lustre/llite/vvp_internal.h index b6b749e..334b5b6 100644 --- 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 __KERNEL__ -# error This file is kernel only. -#endif #include #include "llite_internal.h" diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c index a342584..77b4049 100644 --- a/lustre/llite/vvp_io.c +++ b/lustre/llite/vvp_io.c @@ -41,9 +41,6 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include #include diff --git a/lustre/llite/vvp_lock.c b/lustre/llite/vvp_lock.c index 94f85d4..f50adff 100644 --- a/lustre/llite/vvp_lock.c +++ b/lustre/llite/vvp_lock.c @@ -38,9 +38,6 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include #include diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c index 498d3b2..c9c4366 100644 --- a/lustre/llite/vvp_object.c +++ b/lustre/llite/vvp_object.c @@ -40,9 +40,6 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include diff --git a/lustre/llite/vvp_page.c b/lustre/llite/vvp_page.c index 41d4975..d031f8b 100644 --- a/lustre/llite/vvp_page.c +++ b/lustre/llite/vvp_page.c @@ -41,9 +41,6 @@ #define DEBUG_SUBSYSTEM S_LLITE -#ifndef __KERNEL__ -# error This file is kernel only. -#endif #include #include -- 1.8.3.1