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>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
index e43ece6f808f59c8d83b909a0beee38f36cca5b8..23bccf234af9147ddb8249c6a101e29b536fd581 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
@@ -80,8 +80,6 @@ LL_PROC_PROTO(name)                                \
                                 __##name);          \
 }
 
-typedef struct module module_t;
-
 /*
  * Proc file system APIs
  */

diff --git a/drivers/staging/lustre/include/linux/libcfs/params_tree.h b/drivers/staging/lustre/include/linux/libcfs/params_tree.h
index 3f18a4467037244d8c54d37b994b0a05921e5583..78a2c4ed4d6c57645d0cbc43c0ae3b78f7ee2d06 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/params_tree.h
+++ b/drivers/staging/lustre/include/linux/libcfs/params_tree.h
@@ -54,7 +54,6 @@ typedef struct proc_inode                    cfs_proc_inode_t;
 typedef struct seq_file                         cfs_seq_file_t;
 typedef struct seq_operations             cfs_seq_ops_t;
 typedef struct file_operations           cfs_param_file_ops_t;
-typedef module_t                          *cfs_param_module_t;
 typedef struct proc_dir_entry             cfs_param_dentry_t;
 typedef struct poll_table_struct               cfs_poll_table_t;
 #define CFS_PARAM_MODULE                       THIS_MODULE
@@ -115,11 +114,10 @@ typedef struct cfs_seq_operations {
        int   (*show) (cfs_seq_file_t *m, void *v);
 } cfs_seq_ops_t;
 
-typedef void *cfs_param_module_t;
 typedef void *cfs_poll_table_t;
 
 typedef struct cfs_param_file_ops {
-       cfs_param_module_t owner;
+       struct module *owner;
        int (*open) (cfs_inode_t *, struct file *);
        loff_t (*llseek)(struct file *, loff_t, int);
        int (*release) (cfs_inode_t *, cfs_param_file_t *);

diff --git a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
index e637006203ab5165254fb03eab6d38321e138d43..4da6e372e00bee98532e62480ff291027b1c69ec 100644 (file)
--- a/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
+++ b/drivers/staging/lustre/lustre/include/linux/lustre_fsfilt.h
@@ -54,7 +54,7 @@ typedef void (*fsfilt_cb_t)(struct obd_device *obd, __u64 last_rcvd,
 
 struct fsfilt_operations {
        struct list_head fs_list;
-       module_t *fs_owner;
+       struct module *fs_owner;
        char   *fs_type;
        char   *(* fs_getlabel)(struct super_block *sb);
        void   *(* fs_start)(struct inode *inode, int op, void *desc_private,

diff --git a/drivers/staging/lustre/lustre/include/lu_object.h b/drivers/staging/lustre/lustre/include/lu_object.h
index 8077898e88ec9abbeb46e4fbcbbe01d95a9e3d18..fa31be886ef8c052327a5455a921fe193ef9a761 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lu_object.h
+++ b/drivers/staging/lustre/lustre/include/lu_object.h
@@ -1131,7 +1131,7 @@ struct lu_context_key {
        /**
         * Internal implementation detail: module for this key.
         */
-       module_t *lct_owner;
+       struct module *lct_owner;
        /**
         * References to this key. For debugging.
         */

diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index 8d7cc7ab0039812750a1963dd5e312033b5d1f7d..f315ef77525636baaac68c147b337c2c7a380ac7 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -1136,7 +1136,7 @@ struct ptlrpc_nrs_pol_conf {
         * different module to the one the NRS framework is held within
         * (currently ptlrpc), should set this field to THIS_MODULE.
         */
-       module_t                          *nc_owner;
+       struct module                     *nc_owner;
        /**
         * Policy registration flags; a bitmast of \e nrs_policy_flags
         */
@@ -1211,7 +1211,7 @@ struct ptlrpc_nrs_pol_desc {
         *   then unregistration and lprocfs operations will be properly
         *   serialized.
         */
-       module_t                               *pd_owner;
+       struct module                          *pd_owner;
        /**
         * Bitmask of \e nrs_policy_flags
         */

diff --git a/drivers/staging/lustre/lustre/include/lustre_sec.h b/drivers/staging/lustre/lustre/include/lustre_sec.h
index 9e0908e1c4d66ddac8ce0e24251a12584f03ea82..70b8b133a5c3cc607f4e3adf0cd57660fb2a55c3 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_sec.h
+++ b/drivers/staging/lustre/lustre/include/lustre_sec.h
@@ -796,7 +796,7 @@ struct ptlrpc_sec_sops {
 };
 
 struct ptlrpc_sec_policy {
-       module_t                   *sp_owner;
+       struct module              *sp_owner;
        char                       *sp_name;
        __u16                      sp_policy; /* policy number */
        struct ptlrpc_sec_cops   *sp_cops;   /* client ops */

diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
index 003466498afe02055b2ffc1ba3fa044354e637ef..83b0b3287f1eff2246f74ee77423729ba4a11025 100644 (file)
--- a/drivers/staging/lustre/lustre/include/obd.h
+++ b/drivers/staging/lustre/lustre/include/obd.h
@@ -1108,7 +1108,7 @@ struct md_enqueue_info {
 };
 
 struct obd_ops {
-       module_t *o_owner;
+       struct module *o_owner;
        int (*o_iocontrol)(unsigned int cmd, struct obd_export *exp, int len,
                           void *karg, void *uarg);
        int (*o_get_info)(const struct lu_env *env, struct obd_export *,

diff --git a/drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h b/drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h
index feac60482c97aa1feb2d54e9fec140fa2b538e20..0e9f6c472a37773bc2615af84d187b6e528e0864 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h
+++ b/drivers/staging/lustre/lustre/ptlrpc/gss/gss_api.h
@@ -100,7 +100,7 @@ struct subflavor_desc {
 /* Each mechanism is described by the following struct: */
 struct gss_api_mech {
        struct list_head              gm_list;
-       module_t           *gm_owner;
+       struct module      *gm_owner;
        char               *gm_name;
        rawobj_t                gm_oid;
        atomic_t            gm_count;