From: James Simmons Date: Tue, 8 Mar 2016 22:35:26 +0000 (-0500) Subject: staging: lustre: move libcfs to lnet layer X-Git-Tag: v4.6-rc1~103^2~268 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71bf3883ae5723f7895226c4b5fafa452c0cd00f;p=thirdparty%2Fkernel%2Flinux.git staging: lustre: move libcfs to lnet layer The lustre file system has a layered architecture with libcfs as the lowest layer and LNet layered on top. Then on top of LNet we run the lustre client. This patch moves the libcfs module code out of lustre into the lnet tree. This fits into the long term goal of eventually merging libcfs into LNet. Signed-off-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lnet/Makefile b/drivers/staging/lustre/lnet/Makefile index f6f03e304d81f..0a380fe88ce86 100644 --- a/drivers/staging/lustre/lnet/Makefile +++ b/drivers/staging/lustre/lnet/Makefile @@ -1 +1 @@ -obj-$(CONFIG_LNET) += lnet/ klnds/ selftest/ +obj-$(CONFIG_LNET) += libcfs/ lnet/ klnds/ selftest/ diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile similarity index 93% rename from drivers/staging/lustre/lustre/libcfs/Makefile rename to drivers/staging/lustre/lnet/libcfs/Makefile index 277c1235eb321..8c89455453753 100644 --- a/drivers/staging/lustre/lustre/libcfs/Makefile +++ b/drivers/staging/lustre/lnet/libcfs/Makefile @@ -1,4 +1,4 @@ -obj-$(CONFIG_LUSTRE_FS) += libcfs.o +obj-$(CONFIG_LNET) += libcfs.o libcfs-linux-objs := linux-tracefile.o linux-debug.o libcfs-linux-objs += linux-prim.o linux-cpu.o diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/debug.c rename to drivers/staging/lustre/lnet/libcfs/debug.c diff --git a/drivers/staging/lustre/lustre/libcfs/fail.c b/drivers/staging/lustre/lnet/libcfs/fail.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/fail.c rename to drivers/staging/lustre/lnet/libcfs/fail.c diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lnet/libcfs/hash.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/hash.c rename to drivers/staging/lustre/lnet/libcfs/hash.c diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c rename to drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/libcfs_lock.c rename to drivers/staging/lustre/lnet/libcfs/libcfs_lock.c diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/libcfs_mem.c rename to drivers/staging/lustre/lnet/libcfs/libcfs_mem.c diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/libcfs_string.c rename to drivers/staging/lustre/lnet/libcfs/libcfs_string.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-module.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-module.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c rename to drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/module.c rename to drivers/staging/lustre/lnet/libcfs/module.c diff --git a/drivers/staging/lustre/lustre/libcfs/prng.c b/drivers/staging/lustre/lnet/libcfs/prng.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/prng.c rename to drivers/staging/lustre/lnet/libcfs/prng.c diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/tracefile.c rename to drivers/staging/lustre/lnet/libcfs/tracefile.c diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/tracefile.h rename to drivers/staging/lustre/lnet/libcfs/tracefile.h diff --git a/drivers/staging/lustre/lustre/libcfs/workitem.c b/drivers/staging/lustre/lnet/libcfs/workitem.c similarity index 100% rename from drivers/staging/lustre/lustre/libcfs/workitem.c rename to drivers/staging/lustre/lnet/libcfs/workitem.c diff --git a/drivers/staging/lustre/lustre/Makefile b/drivers/staging/lustre/lustre/Makefile index 35d8b0b2dff42..331e4fcdd5a25 100644 --- a/drivers/staging/lustre/lustre/Makefile +++ b/drivers/staging/lustre/lustre/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_LUSTRE_FS) += libcfs/ obdclass/ ptlrpc/ fld/ osc/ mgc/ \ +obj-$(CONFIG_LUSTRE_FS) += obdclass/ ptlrpc/ fld/ osc/ mgc/ \ fid/ lov/ mdc/ lmv/ llite/ obdecho/