aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Simmons <jsimmons@infradead.org>2016-03-11 20:29:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-12 01:24:47 -0500
commitd47e33e8c8377fe1832a98fcc19cf569d52a463a (patch)
tree0112b2f14818fc66c40ef605d124c251668a77d6
parent8a2c23068e2a825856c399425a37293611f9a617 (diff)
staging: lustre: fix spacing issues checkpatch reported in lnet selftest
Remove any extra spacing as reported by checkpatch. Signed-off-by: James Simmons <jsimmons@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lnet/selftest/brw_test.c6
-rw-r--r--drivers/staging/lustre/lnet/selftest/console.c6
-rw-r--r--drivers/staging/lustre/lnet/selftest/selftest.h2
-rw-r--r--drivers/staging/lustre/lnet/selftest/timer.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
index 7bfc0db49ee9..18c7422d96e6 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -194,12 +194,12 @@ brw_check_page(struct page *pg, int pattern, __u64 magic)
194 return 0; 194 return 0;
195 195
196 if (pattern == LST_BRW_CHECK_SIMPLE) { 196 if (pattern == LST_BRW_CHECK_SIMPLE) {
197 data = *((__u64 *) addr); 197 data = *((__u64 *)addr);
198 if (data != magic) 198 if (data != magic)
199 goto bad_data; 199 goto bad_data;
200 200
201 addr += PAGE_CACHE_SIZE - BRW_MSIZE; 201 addr += PAGE_CACHE_SIZE - BRW_MSIZE;
202 data = *((__u64 *) addr); 202 data = *((__u64 *)addr);
203 if (data != magic) 203 if (data != magic)
204 goto bad_data; 204 goto bad_data;
205 205
@@ -208,7 +208,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic)
208 208
209 if (pattern == LST_BRW_CHECK_FULL) { 209 if (pattern == LST_BRW_CHECK_FULL) {
210 for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) { 210 for (i = 0; i < PAGE_CACHE_SIZE / BRW_MSIZE; i++) {
211 data = *(((__u64 *) addr) + i); 211 data = *(((__u64 *)addr) + i);
212 if (data != magic) 212 if (data != magic)
213 goto bad_data; 213 goto bad_data;
214 } 214 }
diff --git a/drivers/staging/lustre/lnet/selftest/console.c b/drivers/staging/lustre/lnet/selftest/console.c
index 9f1838f73102..b0c9acd3fe71 100644
--- a/drivers/staging/lustre/lnet/selftest/console.c
+++ b/drivers/staging/lustre/lnet/selftest/console.c
@@ -207,7 +207,7 @@ lstcon_group_alloc(char *name, lstcon_group_t **grpp)
207 207
208 grp->grp_ref = 1; 208 grp->grp_ref = 1;
209 if (name) { 209 if (name) {
210 if (strlen(name) > sizeof(grp->grp_name)-1) { 210 if (strlen(name) > sizeof(grp->grp_name) - 1) {
211 LIBCFS_FREE(grp, offsetof(lstcon_group_t, 211 LIBCFS_FREE(grp, offsetof(lstcon_group_t,
212 grp_ndl_hash[LST_NODE_HASHSIZE])); 212 grp_ndl_hash[LST_NODE_HASHSIZE]));
213 return -E2BIG; 213 return -E2BIG;
@@ -525,7 +525,7 @@ lstcon_group_add(char *name)
525 lstcon_group_t *grp; 525 lstcon_group_t *grp;
526 int rc; 526 int rc;
527 527
528 rc = lstcon_group_find(name, &grp) ? 0: -EEXIST; 528 rc = lstcon_group_find(name, &grp) ? 0 : -EEXIST;
529 if (rc) { 529 if (rc) {
530 /* find a group with same name */ 530 /* find a group with same name */
531 lstcon_group_decref(grp); 531 lstcon_group_decref(grp);
@@ -1746,7 +1746,7 @@ lstcon_session_new(char *name, int key, unsigned feats,
1746 console_session.ses_timeout = (timeout <= 0) ? 1746 console_session.ses_timeout = (timeout <= 0) ?
1747 LST_CONSOLE_TIMEOUT : timeout; 1747 LST_CONSOLE_TIMEOUT : timeout;
1748 1748
1749 if (strlen(name) > sizeof(console_session.ses_name)-1) 1749 if (strlen(name) > sizeof(console_session.ses_name) - 1)
1750 return -E2BIG; 1750 return -E2BIG;
1751 strncpy(console_session.ses_name, name, 1751 strncpy(console_session.ses_name, name,
1752 sizeof(console_session.ses_name)); 1752 sizeof(console_session.ses_name));
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h b/drivers/staging/lustre/lnet/selftest/selftest.h
index 96690889bdb3..b605f7f01a3b 100644
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -415,7 +415,7 @@ typedef struct sfw_test_case {
415srpc_client_rpc_t * 415srpc_client_rpc_t *
416sfw_create_rpc(lnet_process_id_t peer, int service, 416sfw_create_rpc(lnet_process_id_t peer, int service,
417 unsigned features, int nbulkiov, int bulklen, 417 unsigned features, int nbulkiov, int bulklen,
418 void (*done) (srpc_client_rpc_t *), void *priv); 418 void (*done)(srpc_client_rpc_t *), void *priv);
419int sfw_create_test_rpc(sfw_test_unit_t *tsu, 419int sfw_create_test_rpc(sfw_test_unit_t *tsu,
420 lnet_process_id_t peer, unsigned features, 420 lnet_process_id_t peer, unsigned features,
421 int nblk, int blklen, srpc_client_rpc_t **rpc); 421 int nblk, int blklen, srpc_client_rpc_t **rpc);
diff --git a/drivers/staging/lustre/lnet/selftest/timer.h b/drivers/staging/lustre/lnet/selftest/timer.h
index 2affecf27bb9..39327bb7de1c 100644
--- a/drivers/staging/lustre/lnet/selftest/timer.h
+++ b/drivers/staging/lustre/lnet/selftest/timer.h
@@ -41,7 +41,7 @@
41struct stt_timer { 41struct stt_timer {
42 struct list_head stt_list; 42 struct list_head stt_list;
43 time64_t stt_expires; 43 time64_t stt_expires;
44 void (*stt_func) (void *); 44 void (*stt_func)(void *);
45 void *stt_data; 45 void *stt_data;
46}; 46};
47 47