Commit graph

208 commits

Author SHA1 Message Date
Greg Kroah-Hartman
b59fe84591 staging: lustre: remove proc_dir_entry_t typedef
Use struct proc_dir_entry like the rest of the kernel does.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 09:10:48 +08:00
Greg Kroah-Hartman
9733ac3330 staging: lustre: remove strange journal macros into the one file using them
This moves the PUSH_JOURNAL and friend macros into debug.c, as that's
the only place they are used, so why are they even a macro?

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 09:03:03 +08:00
Greg Kroah-Hartman
68b636b68e staging: lustre: remove task_t typedef
Use struct task_struct instead.

Also remove the unused libcfs_current() function, while I noticed it
doing this conversion.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:56:42 +08:00
Greg Kroah-Hartman
e7e73793d1 staging: lustre: remove cfs_task_state_t
It's just a long, so remove the typedef and use long.

Side note, all the functions like waitq_* should be removed as well,
they are wrapping functions that don't really do what it seems that they
do based on their name.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:48:26 +08:00
Greg Kroah-Hartman
2f5723a1bf staging: lustre: remove CFS_DECL_WAITQ() macro
Just use DECLARE_WAIT_QUEUE_HEAD() instead.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:39:49 +08:00
Greg Kroah-Hartman
5431935116 staging: lustre: remove timer_list_t typedef
Use struct timer_list instead.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:35:40 +08:00
Greg Kroah-Hartman
8db0fc8931 staging: lustre: remove unused cfs_ waitqueue wrappers
These weren't ever used, so just remove them.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:20:58 +08:00
Greg Kroah-Hartman
6960736c01 staging: lustre: remove cfs_module() macro
Open code the module_init/module_exit lines, and also use
MODULE_VERSION, as it seems that was intended, but just never hooked up
at all.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:16:25 +08:00
Greg Kroah-Hartman
305ec768ff staging: lustre: remove wrappers for two atomic functions
Just call them directly, like the rest of the kernel does.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 08:03:39 +08:00
Greg Kroah-Hartman
c88a6cbb77 staging: lustre: remove typedef for group_info_t
Use "struct group_info" like the rest of the kernel, not a typedef.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 07:59:19 +08:00
Greg Kroah-Hartman
c34d9cd855 staging: lustre: remove typedef for module_t
Use "struct module" like the rest of the kernel, not a typedef.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 07:48:41 +08:00
Greg Kroah-Hartman
409ccba9f2 staging: lustre: remove unused cfs_"symbol" macros
These aren't used, so remove them.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 07:42:22 +08:00
Greg Kroah-Hartman
7ac24edaf4 staging: lustre: remove cfs_for_each_possible_cpu()
It was just a wrapper around for_each_possible_cpu()

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-04 07:36:31 +08:00
Greg Kroah-Hartman
36e607a16b staging: lustre: remove ll_crypto_alloc_blkcipher
Turns out that the ll_crypto_alloc_blkcipher() wrapper didn't even do
anything, and is probably wrong, so it's not needed, just call the
crypto core directly.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-03 14:44:31 +08:00
Greg Kroah-Hartman
2b53313a6d staging: lustre: remove almost all crypto layer wrappers
Almost all of these are just a straight function name rename, so fix
them all up to call the crypto layer properly, no need for a #define to
hide things.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-03 14:29:11 +08:00
Greg Kroah-Hartman
a7f24447d1 staging: lustre: remove cfs_register_sysctl_table macro
It was a wrapper around register_sysctl_table, so just remove it.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-03 14:00:50 +08:00
Greg Kroah-Hartman
0a3bdb0071 staging: lustre: remove RETURN macro
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-03 10:35:28 +08:00
Greg Kroah-Hartman
23f14e79ac staging: lustre: remove EXIT macro
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-03 06:01:58 +08:00
Greg Kroah-Hartman
e05e02e420 staging: lustre: remove RETURN_EXIT macro
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 18:20:34 +08:00
Greg Kroah-Hartman
29aaf4962a staging: lustre: remove ENTRY macro
We have a kernel-wide function tracing system, so use that instead of
rolling a custom one just for one filesystem.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 18:14:51 +08:00
Greg Kroah-Hartman
20fbff1dfd staging: lustre: remove ENTRY/EXIT_NESTING stuff
These macros were empty, so remove them in anticipation of removing the
entire ENTRY/EXIT macros.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 16:24:50 +08:00
Greg Kroah-Hartman
db7392c2fb staging: lustre: remove ll_invalidate_bdev()
It was a wrapper around invalidate_bdev(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 16:17:04 +08:00
Greg Kroah-Hartman
077069aec2 staging: lustre: remove ll_vfs_symlink()
No one was ever even using it.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 16:11:35 +08:00
Greg Kroah-Hartman
8707c96e96 staging: lustre: remove ll_generic_permission()
It was a wrapper around generic_permission(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 16:08:01 +08:00
Greg Kroah-Hartman
9c5fb72cc8 staging: lustre: remove ll_permission()
It was a wrapper around inode_permission(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 16:01:26 +08:00
Greg Kroah-Hartman
6f01433971 staging: lustre: remove ll_generic_file_llseek_size()
It was a wrapper around generic_file_llseek_size(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 15:56:22 +08:00
Greg Kroah-Hartman
dd4c3a486b staging: lustre: remove ll_dentry_open()
It was a wrapper around dentry_open(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 15:51:34 +08:00
Greg Kroah-Hartman
418690b60f staging: lustre: remove ll_blkdev_put()
It was a wrapper around blkdev_put(), totally useless.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 15:46:32 +08:00
Xiong Zhou
49126e47bf staging/lustre: lloop depends on BLOCK
Add a config option for llite/lloop in lustre driver, making it depends
on BLOCK to fix this better:
drivers/staging/lustre/lustre/fid/../include/linux/lustre_compat25.h:117:2:
error: implicit declaration of function ‘unregister_blkdev'

Also, remove the wrapper ll_unregister_blkdev which depends on BLOCK in
the header and just call unregister_blkdev in lloop.c based on Peng Tao's
comment. Drop the redundant dependency on STAGING for LUSTRE_FS, remove
some unnecessary jdb header files which depends on BLOCK btw.

Signed-off-by: Xiong Zhou <jencce.kernel@gmail.com>
Reviewed-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-08-02 15:30:46 +08:00
Emil Goode
805e517aae staging: lustre: Fix sparse warnings about use of obsolete initializer
This patch fixes a lot of sparse warnings about use of obsolete
struct and array initializer.

Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-29 11:29:37 -07:00
Emil Goode
7d46a21a1e staging: lustre: Fix non-ANSI sparse warnings
This patch fixes a lot of non-ANSI sparse warnings by adding void to
parameterless functions.

Signed-off-by: Emil Goode <emilgoode@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-29 11:29:36 -07:00
Xiong Zhou
7b117940f3 staging/lustre: add BLOCK depends in Kconfig
Add BLOCK depends in Kconfig for LUSTRE to fix this:
drivers/staging/lustre/lustre/fid/../include/linux/lustre_compat25.h:117:2:
error: implicit declaration of function ‘unregister_blkdev’

Signed-off-by: Xiong Zhou <jencce.kernel@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:03 -07:00
Sachin Kamat
af7c25588f staging: lustre: obdclass: Remove duplicate header file inclusion
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:03 -07:00
Sachin Kamat
b9cb7fed5e staging: lustre: Remove duplicate header file inclusion in lvfs_linux.c
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:03 -07:00
Sachin Kamat
713542a8cd staging: lustre: Remove duplicate header file inclusion in lmv_obd.c
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:03 -07:00
Sachin Kamat
c92b5ea0af staging: lustre: Remove duplicate header file inclusion in lmv_intent.c
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
0c050588a2 staging: lustre: Remove duplicate header file inclusion in lmv_fld.c
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
1fabbd6f65 staging: lustre: Remove duplicate header file inclusion in rw26.c
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
ee49576196 staging: lustre: Remove duplicate header file inclusion in rw.c
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
f75b7d2d69 staging: lustre: Remove duplicate header file inclusion in lloop.c
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
0ad531db6c staging: lustre: Remove duplicate header file inclusion in llite_mmap.c
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:02 -07:00
Sachin Kamat
2950b2416f staging: lustre: Remove duplicate header file inclusion in dir.c
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
66270ce4e1 staging: lustre: linux-tcpip: Remove duplicate header file inclusion
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
03f278994c staging: lustre: libcfs: Remove duplicate inclusion of header file
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
6a4b8447cf staging: lustre: linux-debug: Remove duplicate inclusion of header file
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
86664eb13e staging: lustre: obd: Remove duplicate inclusion of header file
Removed the header file included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
34d739605e staging: lustre: socklnd: Remove duplicate inclusion of header files
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:01 -07:00
Sachin Kamat
a772bbeeea staging: lustre: o2iblnd: Remove duplicate inclusion of header file
Removed the header files included twice.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-25 12:09:00 -07:00
Peng Tao
17dc1597c5 staging/lustre: fix build on non-x86
On non-x86 we will build with Lustre's errno translate code but
it has a few issues.

Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-24 13:04:46 -07:00
Liu Xuezhao
46fd3c61e2 staging/lustre/obdclass: add obd_target.h
Move some server-side data structures form obd.h to obd_target.h.  To
remove some code dependencies use HAVE_SERVER_SUPPORT to protect some
llog/fsfilt_* functions.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1330
Lustre-change: http://review.whamcloud.com/2678
Signed-off-by: Liu Xuezhao <xuezhao.liu@emc.com>
Signed-off-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Peng Tao <bergwolf@gmail.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2013-07-24 13:04:46 -07:00