openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: lustre: lustre: ptlrpc: Fix space required 

This patch fixes the checkpatch.pl issue
Error: Required space after " '+' ',' '=' '(' ' if' "

Signed-off-by: Hema Prathaban <hemaklnce@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hema Prathaban 2014-08-31 16:30:56 +05:30 committed by Greg Kroah-Hartman
parent 3ace5213e4
commit b533ff4b18
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/lustre/ptlrpc/client.c
View File

@ -289,7 +289,7 @@ static void ptlrpc_at_adj_net_latency(struct ptlrpc_request *req,
at = &req->rq_import->imp_at;
/* Network latency is total time less server processing time */
nl = max_t(int, now - req->rq_sent - service_time, 0) +1/*st rounding*/;
nl = max_t(int, now - req->rq_sent - service_time, 0) + 1/*st rounding*/;
if (service_time > now - req->rq_sent + 3 /* bz16408 */)
CWARN("Reported service time %u > total measured time "
CFS_DURATION_T"\n", service_time,

4
drivers/staging/lustre/lustre/ptlrpc/import.c
View File

@ -922,7 +922,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
* participate since we can reestablish all of our state
* with server again */
if ((MSG_CONNECT_RECOVERING & msg_flags)) {
CDEBUG(level,"%s@%s changed server handle from %#llx to %#llx but is still in recovery\n",
CDEBUG(level, "%s@%s changed server handle from %#llx to %#llx but is still in recovery\n",
obd2cli_tgt(imp->imp_obd),
imp->imp_connection->c_remote_uuid.uuid,
imp->imp_remote_handle.cookie,
@ -1104,7 +1104,7 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
* Enforce ADLER for backward compatibility*/
cli->cl_supp_cksum_types = OBD_CKSUM_ADLER;
}
cli->cl_cksum_type =cksum_type_select(cli->cl_supp_cksum_types);
cli->cl_cksum_type = cksum_type_select(cli->cl_supp_cksum_types);
if (ocd->ocd_connect_flags & OBD_CONNECT_BRW_SIZE)
cli->cl_max_pages_per_rpc =

14
drivers/staging/lustre/lustre/ptlrpc/llog_client.c
View File

@ -187,7 +187,7 @@ static int llog_client_next_block(const struct lu_env *env,
LUSTRE_LOG_VERSION,
LLOG_ORIGIN_HANDLE_NEXT_BLOCK);
if (req == NULL)
GOTO(err_exit, rc =-ENOMEM);
GOTO(err_exit, rc = -ENOMEM);
body = req_capsule_client_get(&req->rq_pill, &RMF_LLOGD_BODY);
body->lgd_logid = loghandle->lgh_id;
@ -206,12 +206,12 @@ static int llog_client_next_block(const struct lu_env *env,
body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
if (body == NULL)
GOTO(out, rc =-EFAULT);
GOTO(out, rc = -EFAULT);
/* The log records are swabbed as they are processed */
ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
if (ptr == NULL)
GOTO(out, rc =-EFAULT);
GOTO(out, rc = -EFAULT);
*cur_idx = body->lgd_saved_index;
*cur_offset = body->lgd_cur_offset;
@ -257,11 +257,11 @@ static int llog_client_prev_block(const struct lu_env *env,
body = req_capsule_server_get(&req->rq_pill, &RMF_LLOGD_BODY);
if (body == NULL)
GOTO(out, rc =-EFAULT);
GOTO(out, rc = -EFAULT);
ptr = req_capsule_server_get(&req->rq_pill, &RMF_EADATA);
if (ptr == NULL)
GOTO(out, rc =-EFAULT);
GOTO(out, rc = -EFAULT);
memcpy(buf, ptr, len);
out:
@ -282,7 +282,7 @@ static int llog_client_read_header(const struct lu_env *env,
int rc;
LLOG_CLIENT_ENTRY(handle->lgh_ctxt, imp);
req = ptlrpc_request_alloc_pack(imp,&RQF_LLOG_ORIGIN_HANDLE_READ_HEADER,
req = ptlrpc_request_alloc_pack(imp, &RQF_LLOG_ORIGIN_HANDLE_READ_HEADER,
LUSTRE_LOG_VERSION,
LLOG_ORIGIN_HANDLE_READ_HEADER);
if (req == NULL)
@ -300,7 +300,7 @@ static int llog_client_read_header(const struct lu_env *env,
hdr = req_capsule_server_get(&req->rq_pill, &RMF_LLOG_LOG_HDR);
if (hdr == NULL)
GOTO(out, rc =-EFAULT);
GOTO(out, rc = -EFAULT);
memcpy(handle->lgh_hdr, hdr, sizeof(*hdr));
handle->lgh_last_idx = handle->lgh_hdr->llh_tail.lrt_index;

2
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
View File

@ -365,7 +365,7 @@ static void enc_pools_insert(struct page ***pools, int npools, int npages)
*/
cur_npools = (page_pools.epp_total_pages + PAGES_PER_POOL - 1) /
PAGES_PER_POOL;
end_npools = (page_pools.epp_total_pages + npages + PAGES_PER_POOL -1) /
end_npools = (page_pools.epp_total_pages + npages + PAGES_PER_POOL - 1) /
PAGES_PER_POOL;
LASSERT(end_npools <= page_pools.epp_max_pools);

4
drivers/staging/lustre/lustre/ptlrpc/sec_config.c
View File

@ -908,7 +908,7 @@ void sptlrpc_conf_client_adapt(struct obd_device *obd)
struct obd_import *imp;
LASSERT(strcmp(obd->obd_type->typ_name, LUSTRE_MDC_NAME) == 0 ||
strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME) ==0);
strcmp(obd->obd_type->typ_name, LUSTRE_OSC_NAME) == 0);
CDEBUG(D_SEC, "obd %s\n", obd->u.cli.cl_target_uuid.uuid);
/* serialize with connect/disconnect import */
@ -1201,7 +1201,7 @@ int sptlrpc_conf_target_get_rules(struct obd_device *obd,
conf_tgt = sptlrpc_conf_get_tgt(conf, obd->obd_name, 0);
rc = sptlrpc_rule_set_extract(&conf->sc_rset,
conf_tgt ? &conf_tgt->sct_rset: NULL,
conf_tgt ? &conf_tgt->sct_rset : NULL,
LUSTRE_SP_ANY, sp_dst, rset);
out:
mutex_unlock(&sptlrpc_conf_lock);