Commit 8dddd268 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman

staging: lustre: lnet: resolve trailing */ errors

This patch resolves the checkpatch error:

Block comments use a trailing */ on a separate line

for the LNet/libcfs layer
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a2d288c6
...@@ -1716,7 +1716,7 @@ EXPORT_SYMBOL(cfs_hash_hlist_for_each); ...@@ -1716,7 +1716,7 @@ EXPORT_SYMBOL(cfs_hash_hlist_for_each);
* the passed callback @func and pass to it as an argument each hash * the passed callback @func and pass to it as an argument each hash
* item and the private @data. During the callback the bucket lock * item and the private @data. During the callback the bucket lock
* is held so the callback must never sleep. * is held so the callback must never sleep.
*/ */
void void
cfs_hash_for_each_key(struct cfs_hash *hs, const void *key, cfs_hash_for_each_key(struct cfs_hash *hs, const void *key,
cfs_hash_for_each_cb_t func, void *data) cfs_hash_for_each_cb_t func, void *data)
......
/* /*
* GPL HEADER START * GPL HEADER START
* *
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
* x(n)=a*x(n-1)+carry mod 2^16 and y(n)=b*y(n-1)+carry mod 2^16, * x(n)=a*x(n-1)+carry mod 2^16 and y(n)=b*y(n-1)+carry mod 2^16,
* number and carry packed within the same 32 bit integer. * number and carry packed within the same 32 bit integer.
* algorithm recommended by Marsaglia * algorithm recommended by Marsaglia
*/ */
#include "../../include/linux/libcfs/libcfs.h" #include "../../include/linux/libcfs/libcfs.h"
......
...@@ -92,14 +92,16 @@ struct lstcon_batch { ...@@ -92,14 +92,16 @@ struct lstcon_batch {
int bat_ntest; /* # of test */ int bat_ntest; /* # of test */
int bat_state; /* state of the batch */ int bat_state; /* state of the batch */
int bat_arg; /* parameter for run|stop, timeout int bat_arg; /* parameter for run|stop, timeout
* for run, force for stop */ * for run, force for stop
*/
char bat_name[LST_NAME_SIZE];/* name of batch */ char bat_name[LST_NAME_SIZE];/* name of batch */
struct list_head bat_test_list; /* list head of tests (struct lstcon_test) struct list_head bat_test_list; /* list head of tests (struct lstcon_test)
*/ */
struct list_head bat_trans_list; /* list head of transaction */ struct list_head bat_trans_list; /* list head of transaction */
struct list_head bat_cli_list; /* list head of client nodes struct list_head bat_cli_list; /* list head of client nodes
* (struct lstcon_node) */ * (struct lstcon_node)
*/
struct list_head *bat_cli_hash; /* hash table of client nodes */ struct list_head *bat_cli_hash; /* hash table of client nodes */
struct list_head bat_srv_list; /* list head of server nodes */ struct list_head bat_srv_list; /* list head of server nodes */
struct list_head *bat_srv_hash; /* hash table of server nodes */ struct list_head *bat_srv_hash; /* hash table of server nodes */
...@@ -147,7 +149,8 @@ struct lstcon_session { ...@@ -147,7 +149,8 @@ struct lstcon_session {
unsigned int ses_features; /* tests features of the session unsigned int ses_features; /* tests features of the session
*/ */
unsigned int ses_feats_updated:1; /* features are synced with unsigned int ses_feats_updated:1; /* features are synced with
* remote test nodes */ * remote test nodes
*/
unsigned int ses_force:1; /* force creating */ unsigned int ses_force:1; /* force creating */
unsigned int ses_shutdown:1; /* session is shutting down */ unsigned int ses_shutdown:1; /* session is shutting down */
unsigned int ses_expired:1; /* console is timedout */ unsigned int ses_expired:1; /* console is timedout */
......
...@@ -113,7 +113,8 @@ struct srpc_join_reply { ...@@ -113,7 +113,8 @@ struct srpc_join_reply {
__u32 join_status; /* returned status */ __u32 join_status; /* returned status */
lst_sid_t join_sid; /* session id */ lst_sid_t join_sid; /* session id */
__u32 join_timeout; /* # seconds' inactivity to __u32 join_timeout; /* # seconds' inactivity to
* expire */ * expire
*/
char join_session[LST_NAME_SIZE]; /* session name */ char join_session[LST_NAME_SIZE]; /* session name */
} WIRE_ATTR; } WIRE_ATTR;
...@@ -190,7 +191,8 @@ struct srpc_test_reqst { ...@@ -190,7 +191,8 @@ struct srpc_test_reqst {
lst_bid_t tsr_bid; /* batch id */ lst_bid_t tsr_bid; /* batch id */
__u32 tsr_service; /* test type: bulk|ping|... */ __u32 tsr_service; /* test type: bulk|ping|... */
__u32 tsr_loop; /* test client loop count or __u32 tsr_loop; /* test client loop count or
* # server buffers needed */ * # server buffers needed
*/
__u32 tsr_concur; /* concurrency of test */ __u32 tsr_concur; /* concurrency of test */
__u8 tsr_is_client; /* is test client or not */ __u8 tsr_is_client; /* is test client or not */
__u8 tsr_stop_onerr; /* stop on error */ __u8 tsr_stop_onerr; /* stop on error */
......
...@@ -131,7 +131,8 @@ srpc_service2reply(int service) ...@@ -131,7 +131,8 @@ srpc_service2reply(int service)
enum srpc_event_type { enum srpc_event_type {
SRPC_BULK_REQ_RCVD = 1, /* passive bulk request(PUT sink/GET source) SRPC_BULK_REQ_RCVD = 1, /* passive bulk request(PUT sink/GET source)
* received */ * received
*/
SRPC_BULK_PUT_SENT = 2, /* active bulk PUT sent (source) */ SRPC_BULK_PUT_SENT = 2, /* active bulk PUT sent (source) */
SRPC_BULK_GET_RPLD = 3, /* active bulk GET replied (sink) */ SRPC_BULK_GET_RPLD = 3, /* active bulk GET replied (sink) */
SRPC_REPLY_RCVD = 4, /* incoming reply received */ SRPC_REPLY_RCVD = 4, /* incoming reply received */
...@@ -295,7 +296,8 @@ struct srpc_service_cd { ...@@ -295,7 +296,8 @@ struct srpc_service_cd {
#define SFW_TEST_WI_MIN 256 #define SFW_TEST_WI_MIN 256
#define SFW_TEST_WI_MAX 2048 #define SFW_TEST_WI_MAX 2048
/* extra buffers for tolerating buggy peers, or unbalanced number /* extra buffers for tolerating buggy peers, or unbalanced number
* of peers between partitions */ * of peers between partitions
*/
#define SFW_TEST_WI_EXTRA 64 #define SFW_TEST_WI_EXTRA 64
/* number of server workitems (mini-thread) for framework service */ /* number of server workitems (mini-thread) for framework service */
...@@ -347,9 +349,11 @@ struct sfw_batch { ...@@ -347,9 +349,11 @@ struct sfw_batch {
struct sfw_test_client_ops { struct sfw_test_client_ops {
int (*tso_init)(struct sfw_test_instance *tsi); /* initialize test int (*tso_init)(struct sfw_test_instance *tsi); /* initialize test
* client */ * client
*/
void (*tso_fini)(struct sfw_test_instance *tsi); /* finalize test void (*tso_fini)(struct sfw_test_instance *tsi); /* finalize test
* client */ * client
*/
int (*tso_prep_rpc)(struct sfw_test_unit *tsu, int (*tso_prep_rpc)(struct sfw_test_unit *tsu,
lnet_process_id_t dest, lnet_process_id_t dest,
struct srpc_client_rpc **rpc); /* prep a tests rpc */ struct srpc_client_rpc **rpc); /* prep a tests rpc */
...@@ -374,7 +378,8 @@ struct sfw_test_instance { ...@@ -374,7 +378,8 @@ struct sfw_test_instance {
spinlock_t tsi_lock; /* serialize */ spinlock_t tsi_lock; /* serialize */
unsigned int tsi_stopping:1; /* test is stopping */ unsigned int tsi_stopping:1; /* test is stopping */
atomic_t tsi_nactive; /* # of active test atomic_t tsi_nactive; /* # of active test
* unit */ * unit
*/
struct list_head tsi_units; /* test units */ struct list_head tsi_units; /* test units */
struct list_head tsi_free_rpcs; /* free rpcs */ struct list_head tsi_free_rpcs; /* free rpcs */
struct list_head tsi_active_rpcs; /* active rpcs */ struct list_head tsi_active_rpcs; /* active rpcs */
...@@ -386,8 +391,10 @@ struct sfw_test_instance { ...@@ -386,8 +391,10 @@ struct sfw_test_instance {
} tsi_u; } tsi_u;
}; };
/* XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at the end of /*
* pages are not used */ * XXX: trailing (PAGE_SIZE % sizeof(lnet_process_id_t)) bytes at the end of
* pages are not used
*/
#define SFW_MAX_CONCUR LST_MAX_CONCUR #define SFW_MAX_CONCUR LST_MAX_CONCUR
#define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(lnet_process_id_packed_t)) #define SFW_ID_PER_PAGE (PAGE_SIZE / sizeof(lnet_process_id_packed_t))
#define SFW_MAX_NDESTS (LNET_MAX_IOV * SFW_ID_PER_PAGE) #define SFW_MAX_NDESTS (LNET_MAX_IOV * SFW_ID_PER_PAGE)
......
...@@ -55,7 +55,8 @@ ...@@ -55,7 +55,8 @@
static struct st_timer_data { static struct st_timer_data {
spinlock_t stt_lock; spinlock_t stt_lock;
unsigned long stt_prev_slot; /* start time of the slot processed unsigned long stt_prev_slot; /* start time of the slot processed
* previously */ * previously
*/
struct list_head stt_hash[STTIMER_NSLOTS]; struct list_head stt_hash[STTIMER_NSLOTS];
int stt_shuttingdown; int stt_shuttingdown;
wait_queue_head_t stt_waitq; wait_queue_head_t stt_waitq;
......
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