LU-14291 build: reduce obdclass code built for client

Several source files are built for the stand alone
lustre client that is never used. Lets not build
that code anymore.

Test-Parameters: trivial
Change-Id: I0af2cdd0c8aab450aced4c14251a02659143b036
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/23775
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Timothy Day <timday@amazon.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre.spec.in b/lustre.spec.in
index eb3a157..1da7fac 100644 (file)
--- a/lustre.spec.in
+++ b/lustre.spec.in
@@ -810,10 +810,12 @@ mv $basemodpath/fs/osd_zfs.ko $basemodpath-osd-zfs/fs/osd_zfs.ko
 %endif
 %if %{with lustre_tests}
 mkdir -p $basemodpath-tests/fs
-mv $basemodpath/fs/llog_test.ko $basemodpath-tests/fs/llog_test.ko
 mv $basemodpath/fs/obd_test.ko $basemodpath-tests/fs/obd_test.ko
 mv $basemodpath/fs/kinode.ko $basemodpath-tests/fs/kinode.ko
-[ -f $basemodpath/fs/ldlm_extent.ko ] && mv $basemodpath/fs/ldlm_extent.ko $basemodpath-tests/fs/ldlm_extent.ko
+%if %{with servers}
+mv $basemodpath/fs/ldlm_extent.ko $basemodpath-tests/fs/ldlm_extent.ko
+mv $basemodpath/fs/llog_test.ko $basemodpath-tests/fs/llog_test.ko
+%endif
 %endif
 %endif
 

diff --git a/lustre/Makefile.in b/lustre/Makefile.in
index 758937f..977d51d 100644 (file)
--- a/lustre/Makefile.in
+++ b/lustre/Makefile.in
@@ -5,8 +5,8 @@ obj-m += ldlm/
 obj-m += obdecho/
 obj-m += mgc/
 obj-m += ec/
-obj-m += kunit/
 
+@TESTS_TRUE@obj-m += kunit/
 @SERVER_TRUE@obj-m += mgs/ mdt/ mdd/ ofd/ quota/ osp/ lod/ lfsck/ target/
 @CLIENT_TRUE@obj-m += lov/ osc/ mdc/ lmv/ llite/ fld/
 @LDISKFS_ENABLED_TRUE@obj-m += osd-ldiskfs/

diff --git a/lustre/autoMakefile.am b/lustre/autoMakefile.am
index f55fcdc..0cdfd67 100644 (file)
--- a/lustre/autoMakefile.am
+++ b/lustre/autoMakefile.am
@@ -35,13 +35,15 @@ AUTOMAKE_OPTIONS = foreign
 
 # also update lustre/autoconf/lustre-core.m4 AC_CONFIG_FILES
 ALWAYS_SUBDIRS = include obdclass ldlm ptlrpc obdecho ec \
-       mgc fid fld doc utils tests scripts autoconf conf kunit
+       mgc fid fld doc utils tests scripts autoconf conf
 
 SERVER_SUBDIRS = mgs mdt mdd ofd osd-zfs osd-ldiskfs \
        quota osp lod target lfsck
 
 CLIENT_SUBDIRS = mdc lmv llite lov osc
 
+TESTS_SUBDIRS = kunit
+
 SUBDIRS := $(ALWAYS_SUBDIRS)
 
 if SERVER
@@ -52,6 +54,10 @@ if CLIENT
 SUBDIRS += $(CLIENT_SUBDIRS)
 endif
 
-DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS)
+if TESTS
+SUBDIRS += $(TESTS_SUBDIRS)
+endif
+
+DIST_SUBDIRS := $(ALWAYS_SUBDIRS) $(SERVER_SUBDIRS) $(CLIENT_SUBDIRS) $(TESTS_SUBDIRS)
 
 EXTRA_DIST = kernel_patches

diff --git a/lustre/kunit/Makefile.in b/lustre/kunit/Makefile.in
index 4c938c1..8c1586d 100644 (file)
--- a/lustre/kunit/Makefile.in
+++ b/lustre/kunit/Makefile.in
@@ -8,9 +8,13 @@
 # Makefile template for kunit
 #
 
-MODULES := llog_test obd_test kinode
-@SERVER_TRUE@MODULES += ldlm_extent
+MODULES := kinode obd_test
+@TESTS_TRUE@@SERVER_TRUE@MODULES += ldlm_extent
+@TESTS_TRUE@@SERVER_TRUE@MODULES += llog_test
 
-EXTRA_DIST = llog_test.c obd_test.c kinode.c ldlm_extent.c
+EXTRA_DIST = kinode.c
+EXTRA_DIST += ldlm_extent.c
+EXTRA_DIST += llog_test.c
+EXTRA_DIST += obd_test.c
 
 @INCLUDE_RULES@

diff --git a/lustre/kunit/autoMakefile.am b/lustre/kunit/autoMakefile.am
index 466341d..27cf4f1 100644 (file)
--- a/lustre/kunit/autoMakefile.am
+++ b/lustre/kunit/autoMakefile.am
@@ -9,11 +9,11 @@
 #
 
 if MODULES
-modulefs_DATA = llog_test$(KMODEXT)
+modulefs_DATA = kinode$(KMODEXT)
 modulefs_DATA += obd_test$(KMODEXT)
-modulefs_DATA += kinode$(KMODEXT)
 if SERVER
 modulefs_DATA += ldlm_extent$(KMODEXT)
+modulefs_DATA += llog_test$(KMODEXT)
 endif # SERVER
 endif # MODULES
 

diff --git a/lustre/obdclass/Makefile.in b/lustre/obdclass/Makefile.in
index e2361b5..de7f25d 100644 (file)
--- a/lustre/obdclass/Makefile.in
+++ b/lustre/obdclass/Makefile.in
@@ -12,13 +12,12 @@ MODULES := obdclass
 
 default: all
 
-obdclass-all-objs := llog.o llog_cat.o llog_obd.o llog_swab.o llog_osd.o
-obdclass-all-objs += class_obd.o genops.o llog_ioctl.o
+obdclass-all-objs := llog.o llog_cat.o llog_obd.o llog_swab.o
+obdclass-all-objs += class_obd.o genops.o
 obdclass-all-objs += lprocfs_status.o lprocfs_counters.o
-obdclass-all-objs += lustre_handles.o lustre_peer.o local_storage.o
+obdclass-all-objs += lustre_handles.o lustre_peer.o
 obdclass-all-objs += statfs_pack.o obdo.o obd_config.o obd_mount.o obd_sysfs.o
-obdclass-all-objs += lu_object.o dt_object.o
-obdclass-all-objs += cl_object.o cl_page.o cl_lock.o cl_io.o
+obdclass-all-objs += lu_object.o cl_object.o cl_page.o cl_lock.o cl_io.o
 obdclass-all-objs += linkea.o upcall_cache.o
 obdclass-all-objs += kernelcomm.o jobid.o
 obdclass-all-objs += integrity.o obd_cksum.o
@@ -26,14 +25,18 @@ obdclass-all-objs += lu_tgt_descs.o lu_tgt_pool.o
 obdclass-all-objs += range_lock.o
 obdclass-all-objs += page_pools.o
 
+@SERVER_TRUE@obdclass-all-objs += dt_object.o
 @SERVER_TRUE@obdclass-all-objs += idmap.o
-@SERVER_TRUE@obdclass-all-objs += upcall_cache_internal.o
+@SERVER_TRUE@obdclass-all-objs += llog_ioctl.o
+@SERVER_TRUE@obdclass-all-objs += llog_osd.o
+@SERVER_TRUE@obdclass-all-objs += local_storage.o
 @SERVER_TRUE@obdclass-all-objs += lprocfs_jobstats.o
 @SERVER_TRUE@obdclass-all-objs += lprocfs_status_server.o
 @SERVER_TRUE@obdclass-all-objs += lu_ucred.o
 @SERVER_TRUE@obdclass-all-objs += md_attrs.o
 @SERVER_TRUE@obdclass-all-objs += obdo_server.o
 @SERVER_TRUE@obdclass-all-objs += scrub.o
+@SERVER_TRUE@obdclass-all-objs += upcall_cache_internal.o
 
 obdclass-objs := $(obdclass-all-objs)
 
@@ -41,15 +44,18 @@ EXTRA_PRE_CFLAGS := -I@LINUX@/fs -I@LDISKFS_DIR@ -I@LDISKFS_DIR@/ldiskfs
 
 EXTRA_DIST = $(obdclass-all-objs:.o=.c) llog_internal.h
 EXTRA_DIST += cl_internal.h local_storage.h upcall_cache_internal.h
-EXTRA_DIST += range_lock.c
 
+@SERVER_FALSE@EXTRA_DIST += dt_object.c
 @SERVER_FALSE@EXTRA_DIST += idmap.c
-@SERVER_FALSE@EXTRA_DIST += upcall_cache_internal.c
+@SERVER_FALSE@EXTRA_DIST += llog_ioctl.c
+@SERVER_FALSE@EXTRA_DIST += llog_osd.c
+@SERVER_FALSE@EXTRA_DIST += local_storage.c
 @SERVER_FALSE@EXTRA_DIST += lprocfs_jobstats.c
 @SERVER_FALSE@EXTRA_DIST += lprocfs_status_server.c
 @SERVER_FALSE@EXTRA_DIST += lu_ucred.c
 @SERVER_FALSE@EXTRA_DIST += md_attrs.c
 @SERVER_FALSE@EXTRA_DIST += obdo_server.c
 @SERVER_FALSE@EXTRA_DIST += scrub.c
+@SERVER_FALSE@EXTRA_DIST += upcall_cache_internal.c
 
 @INCLUDE_RULES@

diff --git a/rpm/kmp-lustre-tests.files b/rpm/kmp-lustre-tests.files
index a6a27d2..e7fb3f5 100644 (file)
--- a/rpm/kmp-lustre-tests.files
+++ b/rpm/kmp-lustre-tests.files
@@ -1,8 +1,8 @@
 %dir %{modules_fs_path}/%{lustre_name}-tests
 %dir %{modules_fs_path}/%{lustre_name}-tests/fs
-%{modules_fs_path}/%{lustre_name}-tests/fs/llog_test.ko
-%{modules_fs_path}/%{lustre_name}-tests/fs/obd_test.ko
 %{modules_fs_path}/%{lustre_name}-tests/fs/kinode.ko
+%{modules_fs_path}/%{lustre_name}-tests/fs/obd_test.ko
 %if %{with servers}
 %{modules_fs_path}/%{lustre_name}-tests/fs/ldlm_extent.ko
+%{modules_fs_path}/%{lustre_name}-tests/fs/llog_test.ko
 %endif