Skip to content

L
linux
Commit 5f849bb0 authored by Lisa Nguyen's avatar Lisa Nguyen Committed by Greg Kroah-Hartman
Browse files
Options

staging/lustre/lnet/selftest: Remove unnecessary spaces in brw_test.c 

Remove spaces between function names and open parentheses to
eliminate warnings generated by checkpatch.pl and meet kernel
coding standards.
Signed-off-by: default avatarLisa Nguyen <lisa@xenapiadmin.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5252bbfd
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 32 deletions
drivers/staging/lustre/lnet/selftest/brw_test.c
View file @ 5f849bb0
...@@ -48,14 +48,14 @@ CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644, ...@@ -48,14 +48,14 @@ CFS_MODULE_PARM(brw_inject_errors, "i", int, 0644,
"# data errors to inject randomly, zero by default"); "# data errors to inject randomly, zero by default");
static void static void
brw_client_fini (sfw_test_instance_t *tsi) brw_client_fini(sfw_test_instance_t *tsi)
{ {
srpc_bulk_t *bulk; srpc_bulk_t *bulk;
sfw_test_unit_t *tsu; sfw_test_unit_t *tsu;
LASSERT (tsi->tsi_is_client); LASSERT(tsi->tsi_is_client);
list_for_each_entry (tsu, &tsi->tsi_units, tsu_list) { list_for_each_entry(tsu, &tsi->tsi_units, tsu_list) {
bulk = tsu->tsu_private; bulk = tsu->tsu_private;
if (bulk == NULL) if (bulk == NULL)
continue; continue;
...@@ -66,7 +66,7 @@ brw_client_fini (sfw_test_instance_t *tsi) ...@@ -66,7 +66,7 @@ brw_client_fini (sfw_test_instance_t *tsi)
} }
int int
brw_client_init (sfw_test_instance_t *tsi) brw_client_init(sfw_test_instance_t *tsi)
{ {
sfw_session_t *sn = tsi->tsi_batch->bat_session; sfw_session_t *sn = tsi->tsi_batch->bat_session;
int flags; int flags;
...@@ -131,7 +131,7 @@ brw_client_init (sfw_test_instance_t *tsi) ...@@ -131,7 +131,7 @@ brw_client_init (sfw_test_instance_t *tsi)
#define BRW_MSIZE sizeof(__u64) #define BRW_MSIZE sizeof(__u64)
int int
brw_inject_one_error (void) brw_inject_one_error(void)
{ {
struct timeval tv; struct timeval tv;
...@@ -147,12 +147,12 @@ brw_inject_one_error (void) ...@@ -147,12 +147,12 @@ brw_inject_one_error (void)
} }
void void
brw_fill_page (struct page *pg, int pattern, __u64 magic) brw_fill_page(struct page *pg, int pattern, __u64 magic)
{ {
char *addr = page_address(pg); char *addr = page_address(pg);
int i; int i;
LASSERT (addr != NULL); LASSERT(addr != NULL);
if (pattern == LST_BRW_CHECK_NONE) if (pattern == LST_BRW_CHECK_NONE)
return; return;
...@@ -173,18 +173,18 @@ brw_fill_page (struct page *pg, int pattern, __u64 magic) ...@@ -173,18 +173,18 @@ brw_fill_page (struct page *pg, int pattern, __u64 magic)
return; return;
} }
LBUG (); LBUG();
return; return;
} }
int int
brw_check_page (struct page *pg, int pattern, __u64 magic) brw_check_page(struct page *pg, int pattern, __u64 magic)
{ {
char *addr = page_address(pg); char *addr = page_address(pg);
__u64 data = 0; /* make compiler happy */ __u64 data = 0; /* make compiler happy */
int i; int i;
LASSERT (addr != NULL); LASSERT(addr != NULL);
if (pattern == LST_BRW_CHECK_NONE) if (pattern == LST_BRW_CHECK_NONE)
return 0; return 0;
...@@ -212,16 +212,16 @@ brw_check_page (struct page *pg, int pattern, __u64 magic) ...@@ -212,16 +212,16 @@ brw_check_page (struct page *pg, int pattern, __u64 magic)
return 0; return 0;
} }
LBUG (); LBUG();
bad_data: bad_data:
CERROR ("Bad data in page %p: "LPX64", "LPX64" expected\n", CERROR("Bad data in page %p: "LPX64", "LPX64" expected\n",
pg, data, magic); pg, data, magic);
return 1; return 1;
} }
void void
brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) brw_fill_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
{ {
int i; int i;
struct page *pg; struct page *pg;
...@@ -233,7 +233,7 @@ brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) ...@@ -233,7 +233,7 @@ brw_fill_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
} }
int int
brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) brw_check_bulk(srpc_bulk_t *bk, int pattern, __u64 magic)
{ {
int i; int i;
struct page *pg; struct page *pg;
...@@ -241,7 +241,7 @@ brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) ...@@ -241,7 +241,7 @@ brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
for (i = 0; i < bk->bk_niov; i++) { for (i = 0; i < bk->bk_niov; i++) {
pg = bk->bk_iovs[i].kiov_page; pg = bk->bk_iovs[i].kiov_page;
if (brw_check_page(pg, pattern, magic) != 0) { if (brw_check_page(pg, pattern, magic) != 0) {
CERROR ("Bulk page %p (%d/%d) is corrupted!\n", CERROR("Bulk page %p (%d/%d) is corrupted!\n",
pg, i, bk->bk_niov); pg, i, bk->bk_niov);
return 1; return 1;
} }
...@@ -251,7 +251,7 @@ brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic) ...@@ -251,7 +251,7 @@ brw_check_bulk (srpc_bulk_t *bk, int pattern, __u64 magic)
} }
static int static int
brw_client_prep_rpc (sfw_test_unit_t *tsu, brw_client_prep_rpc(sfw_test_unit_t *tsu,
lnet_process_id_t dest, srpc_client_rpc_t **rpcpp) lnet_process_id_t dest, srpc_client_rpc_t **rpcpp)
{ {
srpc_bulk_t *bulk = tsu->tsu_private; srpc_bulk_t *bulk = tsu->tsu_private;
...@@ -309,7 +309,7 @@ brw_client_prep_rpc (sfw_test_unit_t *tsu, ...@@ -309,7 +309,7 @@ brw_client_prep_rpc (sfw_test_unit_t *tsu,
} }
static void static void
brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
{ {
__u64 magic = BRW_MAGIC; __u64 magic = BRW_MAGIC;
sfw_test_instance_t *tsi = tsu->tsu_instance; sfw_test_instance_t *tsi = tsu->tsu_instance;
...@@ -318,10 +318,10 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) ...@@ -318,10 +318,10 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
srpc_brw_reply_t *reply = &msg->msg_body.brw_reply; srpc_brw_reply_t *reply = &msg->msg_body.brw_reply;
srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst; srpc_brw_reqst_t *reqst = &rpc->crpc_reqstmsg.msg_body.brw_reqst;
LASSERT (sn != NULL); LASSERT(sn != NULL);
if (rpc->crpc_status != 0) { if (rpc->crpc_status != 0) {
CERROR ("BRW RPC to %s failed with %d\n", CERROR("BRW RPC to %s failed with %d\n",
libcfs_id2str(rpc->crpc_dest), rpc->crpc_status); libcfs_id2str(rpc->crpc_dest), rpc->crpc_status);
if (!tsi->tsi_stopping) /* rpc could have been aborted */ if (!tsi->tsi_stopping) /* rpc could have been aborted */
atomic_inc(&sn->sn_brw_errors); atomic_inc(&sn->sn_brw_errors);
...@@ -333,7 +333,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) ...@@ -333,7 +333,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
__swab32s(&reply->brw_status); __swab32s(&reply->brw_status);
} }
CDEBUG (reply->brw_status ? D_WARNING : D_NET, CDEBUG(reply->brw_status ? D_WARNING : D_NET,
"BRW RPC to %s finished with brw_status: %d\n", "BRW RPC to %s finished with brw_status: %d\n",
libcfs_id2str(rpc->crpc_dest), reply->brw_status); libcfs_id2str(rpc->crpc_dest), reply->brw_status);
...@@ -347,7 +347,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) ...@@ -347,7 +347,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
goto out; goto out;
if (brw_check_bulk(&rpc->crpc_bulk, reqst->brw_flags, magic) != 0) { if (brw_check_bulk(&rpc->crpc_bulk, reqst->brw_flags, magic) != 0) {
CERROR ("Bulk data from %s is corrupted!\n", CERROR("Bulk data from %s is corrupted!\n",
libcfs_id2str(rpc->crpc_dest)); libcfs_id2str(rpc->crpc_dest));
atomic_inc(&sn->sn_brw_errors); atomic_inc(&sn->sn_brw_errors);
rpc->crpc_status = -EBADMSG; rpc->crpc_status = -EBADMSG;
...@@ -358,7 +358,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc) ...@@ -358,7 +358,7 @@ brw_client_done_rpc (sfw_test_unit_t *tsu, srpc_client_rpc_t *rpc)
} }
void void
brw_server_rpc_done (srpc_server_rpc_t *rpc) brw_server_rpc_done(srpc_server_rpc_t *rpc)
{ {
srpc_bulk_t *blk = rpc->srpc_bulk; srpc_bulk_t *blk = rpc->srpc_bulk;
...@@ -366,11 +366,11 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc) ...@@ -366,11 +366,11 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc)
return; return;
if (rpc->srpc_status != 0) if (rpc->srpc_status != 0)
CERROR ("Bulk transfer %s %s has failed: %d\n", CERROR("Bulk transfer %s %s has failed: %d\n",
blk->bk_sink ? "from" : "to", blk->bk_sink ? "from" : "to",
libcfs_id2str(rpc->srpc_peer), rpc->srpc_status); libcfs_id2str(rpc->srpc_peer), rpc->srpc_status);
else else
CDEBUG (D_NET, "Transferred %d pages bulk data %s %s\n", CDEBUG(D_NET, "Transferred %d pages bulk data %s %s\n",
blk->bk_niov, blk->bk_sink ? "from" : "to", blk->bk_niov, blk->bk_sink ? "from" : "to",
libcfs_id2str(rpc->srpc_peer)); libcfs_id2str(rpc->srpc_peer));
...@@ -378,21 +378,21 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc) ...@@ -378,21 +378,21 @@ brw_server_rpc_done (srpc_server_rpc_t *rpc)
} }
int int
brw_bulk_ready (srpc_server_rpc_t *rpc, int status) brw_bulk_ready(srpc_server_rpc_t *rpc, int status)
{ {
__u64 magic = BRW_MAGIC; __u64 magic = BRW_MAGIC;
srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply; srpc_brw_reply_t *reply = &rpc->srpc_replymsg.msg_body.brw_reply;
srpc_brw_reqst_t *reqst; srpc_brw_reqst_t *reqst;
srpc_msg_t *reqstmsg; srpc_msg_t *reqstmsg;
LASSERT (rpc->srpc_bulk != NULL); LASSERT(rpc->srpc_bulk != NULL);
LASSERT (rpc->srpc_reqstbuf != NULL); LASSERT(rpc->srpc_reqstbuf != NULL);
reqstmsg = &rpc->srpc_reqstbuf->buf_msg; reqstmsg = &rpc->srpc_reqstbuf->buf_msg;
reqst = &reqstmsg->msg_body.brw_reqst; reqst = &reqstmsg->msg_body.brw_reqst;
if (status != 0) { if (status != 0) {
CERROR ("BRW bulk %s failed for RPC from %s: %d\n", CERROR("BRW bulk %s failed for RPC from %s: %d\n",
reqst->brw_rw == LST_BRW_READ ? "READ" : "WRITE", reqst->brw_rw == LST_BRW_READ ? "READ" : "WRITE",
libcfs_id2str(rpc->srpc_peer), status); libcfs_id2str(rpc->srpc_peer), status);
return -EIO; return -EIO;
...@@ -405,7 +405,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status) ...@@ -405,7 +405,7 @@ brw_bulk_ready (srpc_server_rpc_t *rpc, int status)
__swab64s(&magic); __swab64s(&magic);
if (brw_check_bulk(rpc->srpc_bulk, reqst->brw_flags, magic) != 0) { if (brw_check_bulk(rpc->srpc_bulk, reqst->brw_flags, magic) != 0) {
CERROR ("Bulk data from %s is corrupted!\n", CERROR("Bulk data from %s is corrupted!\n",
libcfs_id2str(rpc->srpc_peer)); libcfs_id2str(rpc->srpc_peer));
reply->brw_status = EBADMSG; reply->brw_status = EBADMSG;
} }
...@@ -424,10 +424,10 @@ brw_server_handle(struct srpc_server_rpc *rpc) ...@@ -424,10 +424,10 @@ brw_server_handle(struct srpc_server_rpc *rpc)
int npg; int npg;
int rc; int rc;
LASSERT (sv->sv_id == SRPC_SERVICE_BRW); LASSERT(sv->sv_id == SRPC_SERVICE_BRW);
if (reqstmsg->msg_magic != SRPC_MSG_MAGIC) { if (reqstmsg->msg_magic != SRPC_MSG_MAGIC) {
LASSERT (reqstmsg->msg_magic == __swab32(SRPC_MSG_MAGIC)); LASSERT(reqstmsg->msg_magic == __swab32(SRPC_MSG_MAGIC));
__swab32s(&reqst->brw_rw); __swab32s(&reqst->brw_rw);
__swab32s(&reqst->brw_len); __swab32s(&reqst->brw_len);
...@@ -435,7 +435,7 @@ brw_server_handle(struct srpc_server_rpc *rpc) ...@@ -435,7 +435,7 @@ brw_server_handle(struct srpc_server_rpc *rpc)
__swab64s(&reqst->brw_rpyid); __swab64s(&reqst->brw_rpyid);
__swab64s(&reqst->brw_bulkid); __swab64s(&reqst->brw_bulkid);
} }
LASSERT (reqstmsg->msg_type == (__u32)srpc_service2request(sv->sv_id)); LASSERT(reqstmsg->msg_type == (__u32)srpc_service2request(sv->sv_id));
reply->brw_status = 0; reply->brw_status = 0;
rpc->srpc_done = brw_server_rpc_done; rpc->srpc_done = brw_server_rpc_done;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7