LU-2675 llite: merge lclient/*.c into llite/

Merge the lclient directory into the llite directory.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I0f08d88289edce21b63810c23de66b6963718f21
Reviewed-on: http://review.whamcloud.com/10171
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index efe98f9..b52da49 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -45,7 +45,7 @@ ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho \
 SERVER_SUBDIRS = ost mgs mdt mdd ofd osd-zfs osd-ldiskfs \
        quota osp lod target lfsck nodemap
 
-CLIENT_SUBDIRS = mdc lmv llite lclient lov osc
+CLIENT_SUBDIRS = mdc lmv llite lov osc
 
 SUBDIRS := $(ALWAYS_SUBDIRS)
 

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index 0891fd4..a9fd267 100644 (file)
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -1961,7 +1961,6 @@ lustre/fid/Makefile
 lustre/fid/autoMakefile
 lustre/llite/Makefile
 lustre/llite/autoMakefile
-lustre/lclient/Makefile
 lustre/lov/Makefile
 lustre/lov/autoMakefile
 lustre/mdc/Makefile

diff --git a/lustre/lclient/.gitignore b/lustre/lclient/.gitignore
deleted file mode 100644 (file)
index 10a7e8d..0000000
--- a/lustre/lclient/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/Makefile.in

diff --git a/lustre/lclient/Makefile.am b/lustre/lclient/Makefile.am
deleted file mode 100644 (file)
index b5a6d4a..0000000
--- a/lustre/lclient/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST=glimpse.c lcommon_cl.c lcommon_misc.c

diff --git a/lustre/liblustre/Makefile.am b/lustre/liblustre/Makefile.am
index 6473813..9cb3682 100644 (file)
--- a/lustre/liblustre/Makefile.am
+++ b/lustre/liblustre/Makefile.am
@@ -50,8 +50,7 @@ install-exec-hook:
 endif
 
 libllite_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \
-                    lutil.c lutil.h llite_lib.h llite_cl.c \
-                     ../lclient/lcommon_cl.c ../lclient/glimpse.c ../lclient/lcommon_misc.c
+                    lutil.c lutil.h llite_lib.h llite_cl.c
 
 # for make rpms -- need cleanup
 liblustre_a_SOURCES = llite_lib.c super.c namei.c rw.c file.c dir.c \

diff --git a/lustre/llite/Makefile.in b/lustre/llite/Makefile.in
index 562b9d0..cfe49d3 100644 (file)
--- a/lustre/llite/Makefile.in
+++ b/lustre/llite/Makefile.in
@@ -4,7 +4,9 @@ lustre-objs := dcache.o dir.o file.o llite_close.o llite_lib.o llite_nfs.o
 lustre-objs += rw.o lproc_llite.o namei.o symlink.o llite_mmap.o
 lustre-objs += xattr.o xattr_cache.o remote_perm.o llite_rmtacl.o llite_capa.o
 lustre-objs += rw26.o super25.o statahead.o
-lustre-objs += ../lclient/glimpse.o ../lclient/lcommon_cl.o ../lclient/lcommon_misc.o
+lustre-objs += glimpse.o
+lustre-objs += lcommon_cl.o
+lustre-objs += lcommon_misc.o
 lustre-objs += vvp_dev.o vvp_page.o vvp_lock.o vvp_io.o vvp_object.o
 
 llite_lloop-objs := lloop.o

diff --git a/lustre/lclient/glimpse.c b/lustre/llite/glimpse.c
similarity index 100%
rename from lustre/lclient/glimpse.c
rename to lustre/llite/glimpse.c

diff --git a/lustre/lclient/lcommon_cl.c b/lustre/llite/lcommon_cl.c
similarity index 100%
rename from lustre/lclient/lcommon_cl.c
rename to lustre/llite/lcommon_cl.c

diff --git a/lustre/lclient/lcommon_misc.c b/lustre/llite/lcommon_misc.c
similarity index 100%
rename from lustre/lclient/lcommon_misc.c
rename to lustre/llite/lcommon_misc.c