staging: lustre: Remove typedef and update cfs_debug_limit_state struct

Removed typedef keyword and rename the cfs_debug_limit_state_t
struct to cfs_debug_limit_state in libcfs_debug.h. These changes
resolve the "Do not add new typedefs" warning generated by
checkpatch.pl and meet kernel coding style.

Struct variables in other header and source files
that depend on libcfs_debug.h are updated as well.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
index e6439d19f3e55939d98f2bd240442b2d31258e14..40282b70bd1bd6e665a99d82a912ff50b52add8f 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_debug.h
@@ -165,11 +165,11 @@ struct ptldebug_header {
 #define CDEBUG_DEFAULT_MAX_DELAY (cfs_time_seconds(600))        /* jiffies */
 #define CDEBUG_DEFAULT_MIN_DELAY ((cfs_time_seconds(1) + 1) / 2) /* jiffies */
 #define CDEBUG_DEFAULT_BACKOFF   2
-typedef struct {
+struct cfs_debug_limit_state {
        cfs_time_t      cdls_next;
        unsigned int    cdls_delay;
        int          cdls_count;
-} cfs_debug_limit_state_t;
+};
 
 struct libcfs_debug_msg_data {
        const char             *msg_file;
@@ -177,7 +177,7 @@ struct libcfs_debug_msg_data {
        int                   msg_subsys;
        int                   msg_line;
        int                   msg_mask;
-       cfs_debug_limit_state_t  *msg_cdls;
+       struct cfs_debug_limit_state  *msg_cdls;
 };
 
 #define LIBCFS_DEBUG_MSG_DATA_INIT(data, mask, cdls)   \
@@ -226,7 +226,7 @@ do {                                                                    \
 
 #define CDEBUG_LIMIT(mask, format, ...)         \
 do {                                       \
-       static cfs_debug_limit_state_t cdls;    \
+       static struct cfs_debug_limit_state cdls;    \
                                                \
        __CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\
 } while (0)

diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
index 7020d9cd9eb2bb5794e59df0c13169bb4790e58c..122441f45a68cf9c6084735017d95ce846c7ad7f 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
@@ -1083,7 +1083,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
  * Rate-limited version of lock printing function.
  */
 #define LDLM_DEBUG_LIMIT(mask, lock, fmt, a...) do {                    \
-       static cfs_debug_limit_state_t _ldlm_cdls;                         \
+       static struct cfs_debug_limit_state _ldlm_cdls;                    \
        LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, mask, &_ldlm_cdls);       \
        ldlm_lock_debug(&msgdata, mask, &_ldlm_cdls, lock, "### " fmt , ##a);\
 } while (0)

diff --git a/drivers/staging/lustre/lustre/include/lustre_net.h b/drivers/staging/lustre/lustre/include/lustre_net.h
index e947002fae04048258c0c99ccf76e501a0a36eb3..cf2b90d1d08b5eedd7be3a7eda5b56bf2338f49b 100644 (file)
--- a/drivers/staging/lustre/lustre/include/lustre_net.h
+++ b/drivers/staging/lustre/lustre/include/lustre_net.h
@@ -2206,7 +2206,7 @@ do {                                                                        \
 #define DEBUG_REQ(level, req, fmt, args...)                               \
 do {                                                                     \
        if ((level) & (D_ERROR | D_WARNING)) {                          \
-               static cfs_debug_limit_state_t cdls;                      \
+               static struct cfs_debug_limit_state cdls;                         \
                LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, level, &cdls);          \
                debug_req(&msgdata, level, &cdls, req, "@@@ "fmt" ", ## args);\
        } else {                                                              \

diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lustre/libcfs/tracefile.c
index 357f40079ae097ff709ad21ea0bf0b4aeb7f5e28..f71a3cc63ad85032226e37630be781d25088bd9d 100644 (file)
--- a/drivers/staging/lustre/lustre/libcfs/tracefile.c
+++ b/drivers/staging/lustre/lustre/libcfs/tracefile.c
@@ -276,7 +276,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
        int                     remain;
        int                     mask = msgdata->msg_mask;
        const char              *file = kbasename(msgdata->msg_file);
-       cfs_debug_limit_state_t   *cdls = msgdata->msg_cdls;
+       struct cfs_debug_limit_state   *cdls = msgdata->msg_cdls;
 
        tcd = cfs_trace_get_tcd();