LU-9859 libcfs: move files out of libcfs/linux

Files that are not used to handle various kernel verisons are
promoted out of the linux directory. Loosely based on

Linux-commit: f72c3ab791ac0b2b75b5b5d4d51d8eb89ea1e515

This bring us more into sync with linux lustre client.

Change-Id: I4aad42671de14b4e5ca0743d2126363c829b0d74
Test-Parameters: trivial
Signed-off-by: James Simmons <jsimmons@infradead.org>
Reviewed-on: https://review.whamcloud.com/37191
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.super@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/libcfs/include/libcfs/linux/Makefile.am b/libcfs/include/libcfs/linux/Makefile.am
index a3c480d..3e2c178 100644 (file)
--- a/libcfs/include/libcfs/linux/Makefile.am
+++ b/libcfs/include/libcfs/linux/Makefile.am
@@ -1,3 +1,3 @@
 EXTRA_DIST = linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \
 EXTRA_DIST = linux-misc.h linux-fs.h linux-mem.h linux-time.h linux-cpu.h \

-            linux-list.h linux-hash.h linux-uuid.h linux-crypto.h linux-wait.h \
+            linux-list.h linux-hash.h linux-uuid.h linux-wait.h \

             linux-refcount.h processor.h
             linux-refcount.h processor.h

diff --git a/libcfs/libcfs/Makefile.in b/libcfs/libcfs/Makefile.in
index d953a28..f4c2d2f 100644 (file)
--- a/libcfs/libcfs/Makefile.in
+++ b/libcfs/libcfs/Makefile.in
@@ -1,10 +1,8 @@
 MODULES = libcfs
 
 MODULES = libcfs
 

-libcfs-linux-objs := linux-tracefile.o linux-debug.o
-libcfs-linux-objs += linux-prim.o
+libcfs-linux-objs := linux-prim.o

 libcfs-linux-objs += linux-curproc.o
 libcfs-linux-objs += linux-hash.o
 libcfs-linux-objs += linux-curproc.o
 libcfs-linux-objs += linux-hash.o

-libcfs-linux-objs += linux-crypto.o linux-crypto-adler.o

 libcfs-linux-objs += linux-wait.o
 
 default: all
 libcfs-linux-objs += linux-wait.o
 
 default: all


@@ -12,9 +10,11 @@ default: all
 libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
 
 libcfs-all-objs := debug.o fail.o module.o tracefile.o \
 libcfs-linux-objs := $(addprefix linux/,$(libcfs-linux-objs))
 
 libcfs-all-objs := debug.o fail.o module.o tracefile.o \

-                  libcfs_string.o hash.o \
+                  libcfs_string.o hash.o heap.o \

                   workitem.o libcfs_cpu.o \
                   workitem.o libcfs_cpu.o \

-                  libcfs_mem.o libcfs_lock.o heap.o
+                  libcfs_mem.o libcfs_lock.o \
+                  linux-crypto.o linux-crypto-adler.o \
+                  linux-debug.o linux-tracefile.o

 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
 
 
 libcfs-objs := $(libcfs-linux-objs) $(libcfs-all-objs)
 

diff --git a/libcfs/libcfs/autoMakefile.am b/libcfs/libcfs/autoMakefile.am
index b09c7a1..92c7564 100644 (file)
--- a/libcfs/libcfs/autoMakefile.am
+++ b/libcfs/libcfs/autoMakefile.am
@@ -55,7 +55,8 @@ endif # LINUX
 
 endif # MODULES
 
 
 endif # MODULES
 

-MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux-*.c linux/*.o libcfs
+MOSTLYCLEANFILES := @MOSTLYCLEANFILES@ linux/*.o libcfs

 EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h \
              workitem.c fail.c libcfs_cpu.c \
 EXTRA_DIST := $(libcfs-all-objs:%.o=%.c) tracefile.h \
              workitem.c fail.c libcfs_cpu.c \

-             heap.c libcfs_mem.c libcfs_lock.c
+             heap.c libcfs_mem.c libcfs_lock.c \
+             linux-crypto.h

diff --git a/libcfs/libcfs/linux/linux-crypto-adler.c b/libcfs/libcfs/linux-crypto-adler.c
similarity index 98%
rename from libcfs/libcfs/linux/linux-crypto-adler.c
rename to libcfs/libcfs/linux-crypto-adler.c
index 90f502f..44bf374 100644 (file)
--- a/libcfs/libcfs/linux/linux-crypto-adler.c
+++ b/libcfs/libcfs/linux-crypto-adler.c
@@ -31,8 +31,8 @@
 
 #include <linux/module.h>
 #include <linux/zutil.h>
 
 #include <linux/module.h>
 #include <linux/zutil.h>

-#include <libcfs/linux/linux-crypto.h>

 #include <crypto/internal/hash.h>
 #include <crypto/internal/hash.h>

+#include "linux-crypto.h"

 
 #define CHKSUM_BLOCK_SIZE      1
 #define CHKSUM_DIGEST_SIZE     4
 
 #define CHKSUM_BLOCK_SIZE      1
 #define CHKSUM_DIGEST_SIZE     4

diff --git a/libcfs/libcfs/linux/linux-crypto.c b/libcfs/libcfs/linux-crypto.c
similarity index 99%
rename from libcfs/libcfs/linux/linux-crypto.c
rename to libcfs/libcfs/linux-crypto.c
index bd59555..928117e 100644 (file)
--- a/libcfs/libcfs/linux/linux-crypto.c
+++ b/libcfs/libcfs/linux-crypto.c
@@ -32,7 +32,7 @@
 #include <linux/pagemap.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>
 #include <linux/pagemap.h>
 #include <libcfs/libcfs.h>
 #include <libcfs/libcfs_crypto.h>

-#include <libcfs/linux/linux-crypto.h>
+#include "linux-crypto.h"

 
 #ifndef HAVE_CRYPTO_HASH_HELPERS
 static inline const char *crypto_ahash_alg_name(struct crypto_ahash *tfm)
 
 #ifndef HAVE_CRYPTO_HASH_HELPERS
 static inline const char *crypto_ahash_alg_name(struct crypto_ahash *tfm)

diff --git a/libcfs/include/libcfs/linux/linux-crypto.h b/libcfs/libcfs/linux-crypto.h
similarity index 100%
rename from libcfs/include/libcfs/linux/linux-crypto.h
rename to libcfs/libcfs/linux-crypto.h

diff --git a/libcfs/libcfs/linux/linux-debug.c b/libcfs/libcfs/linux-debug.c
similarity index 100%
rename from libcfs/libcfs/linux/linux-debug.c
rename to libcfs/libcfs/linux-debug.c

diff --git a/libcfs/libcfs/linux/linux-tracefile.c b/libcfs/libcfs/linux-tracefile.c
similarity index 100%
rename from libcfs/libcfs/linux/linux-tracefile.c
rename to libcfs/libcfs/linux-tracefile.c

diff --git a/libcfs/libcfs/linux/Makefile.am b/libcfs/libcfs/linux/Makefile.am
index bd6f26d..273f97d 100644 (file)
--- a/libcfs/libcfs/linux/Makefile.am
+++ b/libcfs/libcfs/linux/Makefile.am
@@ -1,3 +1,4 @@
-EXTRA_DIST = linux-debug.c linux-prim.c linux-tracefile.c      \
-       linux-curproc.c linux-hash.c linux-wait.c\
-       linux-crypto.c linux-crypto-adler.c
+EXTRA_DIST = linux-prim.c \
+            linux-curproc.c \
+            linux-hash.c \
+            linux-wait.c

diff --git a/lustre/ptlrpc/gss/gss_crypto.c b/lustre/ptlrpc/gss/gss_crypto.c
index 5aebc48..a6ad8f6 100644 (file)
--- a/lustre/ptlrpc/gss/gss_crypto.c
+++ b/lustre/ptlrpc/gss/gss_crypto.c
@@ -48,7 +48,6 @@
 
 #define DEBUG_SUBSYSTEM S_SEC
 
 
 #define DEBUG_SUBSYSTEM S_SEC
 

-#include <libcfs/linux/linux-crypto.h>

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