Commit cb68dd2d authored by Kristina Martsenko's avatar Kristina Martsenko Committed by Greg Kroah-Hartman

staging: lustre: ptlrpc: clean up whitespace around braces

Fix the following types of checkpatch errors to comply with coding
style:

ERROR: space required after that close brace '}'
ERROR: space required before the open brace '{'

Also change "if (x == 0)" into "if (!x)" on one line, to avoid
introducing new checkpatch issues.
Signed-off-by: default avatarKristina Martsenko <kristina.martsenko@gmail.com>
Reviewed-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3949015e
...@@ -1596,7 +1596,8 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) ...@@ -1596,7 +1596,8 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set)
continue; continue;
spin_lock(&imp->imp_lock); spin_lock(&imp->imp_lock);
if (ptlrpc_import_delay_req(imp, req, &status)){ if (ptlrpc_import_delay_req(imp, req,
&status)) {
/* put on delay list - only if we wait /* put on delay list - only if we wait
* recovery finished - before send */ * recovery finished - before send */
list_del_init(&req->rq_list); list_del_init(&req->rq_list);
......
...@@ -804,7 +804,8 @@ int gss_cli_ctx_verify(struct ptlrpc_cli_ctx *ctx, ...@@ -804,7 +804,8 @@ int gss_cli_ctx_verify(struct ptlrpc_cli_ctx *ctx,
case PTLRPC_GSS_PROC_DATA: case PTLRPC_GSS_PROC_DATA:
pack_bulk = ghdr->gh_flags & LUSTRE_GSS_PACK_BULK; pack_bulk = ghdr->gh_flags & LUSTRE_GSS_PACK_BULK;
if (!req->rq_early && !equi(req->rq_pack_bulk == 1, pack_bulk)){ if (!req->rq_early &&
!equi(req->rq_pack_bulk == 1, pack_bulk)) {
CERROR("%s bulk flag in reply\n", CERROR("%s bulk flag in reply\n",
req->rq_pack_bulk ? "missing" : "unexpected"); req->rq_pack_bulk ? "missing" : "unexpected");
return -EPROTO; return -EPROTO;
...@@ -1009,7 +1010,8 @@ int gss_cli_ctx_unseal(struct ptlrpc_cli_ctx *ctx, ...@@ -1009,7 +1010,8 @@ int gss_cli_ctx_unseal(struct ptlrpc_cli_ctx *ctx,
case PTLRPC_GSS_PROC_DATA: case PTLRPC_GSS_PROC_DATA:
pack_bulk = ghdr->gh_flags & LUSTRE_GSS_PACK_BULK; pack_bulk = ghdr->gh_flags & LUSTRE_GSS_PACK_BULK;
if (!req->rq_early && !equi(req->rq_pack_bulk == 1, pack_bulk)){ if (!req->rq_early &&
!equi(req->rq_pack_bulk == 1, pack_bulk)) {
CERROR("%s bulk flag in reply\n", CERROR("%s bulk flag in reply\n",
req->rq_pack_bulk ? "missing" : "unexpected"); req->rq_pack_bulk ? "missing" : "unexpected");
return -EPROTO; return -EPROTO;
...@@ -1979,7 +1981,7 @@ int gss_svc_handle_init(struct ptlrpc_request *req, ...@@ -1979,7 +1981,7 @@ int gss_svc_handle_init(struct ptlrpc_request *req,
return SECSVC_DROP; return SECSVC_DROP;
} }
if (reqbuf->lm_bufcount < 3 || reqbuf->lm_bufcount > 4){ if (reqbuf->lm_bufcount < 3 || reqbuf->lm_bufcount > 4) {
CERROR("Invalid bufcount %d\n", reqbuf->lm_bufcount); CERROR("Invalid bufcount %d\n", reqbuf->lm_bufcount);
return SECSVC_DROP; return SECSVC_DROP;
} }
......
...@@ -66,7 +66,8 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len, ...@@ -66,7 +66,8 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len,
md.eq_handle = ptlrpc_eq_h; md.eq_handle = ptlrpc_eq_h;
if (unlikely(ack == LNET_ACK_REQ && if (unlikely(ack == LNET_ACK_REQ &&
OBD_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_ACK, OBD_FAIL_ONCE))){ OBD_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_ACK,
OBD_FAIL_ONCE))) {
/* don't ask for the ack to simulate failing client */ /* don't ask for the ack to simulate failing client */
ack = LNET_NOACK_REQ; ack = LNET_NOACK_REQ;
} }
......
...@@ -80,10 +80,10 @@ void ptlrpc_lprocfs_rpc_sent(struct ptlrpc_request *req, long amount); ...@@ -80,10 +80,10 @@ void ptlrpc_lprocfs_rpc_sent(struct ptlrpc_request *req, long amount);
void ptlrpc_lprocfs_do_request_stat(struct ptlrpc_request *req, void ptlrpc_lprocfs_do_request_stat(struct ptlrpc_request *req,
long q_usec, long work_usec); long q_usec, long work_usec);
#else #else
#define ptlrpc_lprocfs_register_service(params...) do{}while (0) #define ptlrpc_lprocfs_register_service(params...) do {} while (0)
#define ptlrpc_lprocfs_unregister_service(params...) do{}while (0) #define ptlrpc_lprocfs_unregister_service(params...) do {} while (0)
#define ptlrpc_lprocfs_rpc_sent(params...) do{}while (0) #define ptlrpc_lprocfs_rpc_sent(params...) do {} while (0)
#define ptlrpc_lprocfs_do_request_stat(params...) do{}while (0) #define ptlrpc_lprocfs_do_request_stat(params...) do {} while (0)
#endif /* LPROCFS */ #endif /* LPROCFS */
/* NRS */ /* NRS */
......
...@@ -1268,7 +1268,7 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) ...@@ -1268,7 +1268,7 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req)
return -ETIMEDOUT; return -ETIMEDOUT;
} }
if ((lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT) == 0){ if (!(lustre_msghdr_get_flags(req->rq_reqmsg) & MSGHDR_AT_SUPPORT)) {
DEBUG_REQ(D_INFO, req, "Wanted to ask client for more time, " DEBUG_REQ(D_INFO, req, "Wanted to ask client for more time, "
"but no AT support"); "but no AT support");
return -ENOSYS; return -ENOSYS;
......
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