Commit a3ea59e0 authored by Lisa Nguyen's avatar Lisa Nguyen Committed by Greg Kroah-Hartman

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: default avatarLisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 996adff8
...@@ -165,11 +165,11 @@ struct ptldebug_header { ...@@ -165,11 +165,11 @@ struct ptldebug_header {
#define CDEBUG_DEFAULT_MAX_DELAY (cfs_time_seconds(600)) /* jiffies */ #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_MIN_DELAY ((cfs_time_seconds(1) + 1) / 2) /* jiffies */
#define CDEBUG_DEFAULT_BACKOFF 2 #define CDEBUG_DEFAULT_BACKOFF 2
typedef struct { struct cfs_debug_limit_state {
cfs_time_t cdls_next; cfs_time_t cdls_next;
unsigned int cdls_delay; unsigned int cdls_delay;
int cdls_count; int cdls_count;
} cfs_debug_limit_state_t; };
struct libcfs_debug_msg_data { struct libcfs_debug_msg_data {
const char *msg_file; const char *msg_file;
...@@ -177,7 +177,7 @@ struct libcfs_debug_msg_data { ...@@ -177,7 +177,7 @@ struct libcfs_debug_msg_data {
int msg_subsys; int msg_subsys;
int msg_line; int msg_line;
int msg_mask; 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) \ #define LIBCFS_DEBUG_MSG_DATA_INIT(data, mask, cdls) \
...@@ -226,7 +226,7 @@ do { \ ...@@ -226,7 +226,7 @@ do { \
#define CDEBUG_LIMIT(mask, format, ...) \ #define CDEBUG_LIMIT(mask, format, ...) \
do { \ do { \
static cfs_debug_limit_state_t cdls; \ static struct cfs_debug_limit_state cdls; \
\ \
__CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\ __CDEBUG(&cdls, mask, format, ## __VA_ARGS__);\
} while (0) } while (0)
......
...@@ -1083,7 +1083,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, ...@@ -1083,7 +1083,7 @@ void _ldlm_lock_debug(struct ldlm_lock *lock,
* Rate-limited version of lock printing function. * Rate-limited version of lock printing function.
*/ */
#define LDLM_DEBUG_LIMIT(mask, lock, fmt, a...) do { \ #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); \ LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, mask, &_ldlm_cdls); \
ldlm_lock_debug(&msgdata, mask, &_ldlm_cdls, lock, "### " fmt , ##a);\ ldlm_lock_debug(&msgdata, mask, &_ldlm_cdls, lock, "### " fmt , ##a);\
} while (0) } while (0)
......
...@@ -2206,7 +2206,7 @@ do { \ ...@@ -2206,7 +2206,7 @@ do { \
#define DEBUG_REQ(level, req, fmt, args...) \ #define DEBUG_REQ(level, req, fmt, args...) \
do { \ do { \
if ((level) & (D_ERROR | D_WARNING)) { \ 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); \ LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, level, &cdls); \
debug_req(&msgdata, level, &cdls, req, "@@@ "fmt" ", ## args);\ debug_req(&msgdata, level, &cdls, req, "@@@ "fmt" ", ## args);\
} else { \ } else { \
......
...@@ -276,7 +276,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata, ...@@ -276,7 +276,7 @@ int libcfs_debug_vmsg2(struct libcfs_debug_msg_data *msgdata,
int remain; int remain;
int mask = msgdata->msg_mask; int mask = msgdata->msg_mask;
const char *file = kbasename(msgdata->msg_file); 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(); tcd = cfs_trace_get_tcd();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment