Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/lustre/lustre/ptlrpc/client.c

+2 −1
Original line number Diff line number Diff line
@@ -1596,7 +1596,8 @@ int ptlrpc_check_set(const struct lu_env *env, struct ptlrpc_request_set *set) 
					continue;



				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

					 * recovery finished - before send */

					list_del_init(&req->rq_list);

drivers/staging/lustre/lustre/ptlrpc/gss/sec_gss.c

+5 −3
Original line number Diff line number Diff line
@@ -804,7 +804,8 @@ int gss_cli_ctx_verify(struct ptlrpc_cli_ctx *ctx, 
	case PTLRPC_GSS_PROC_DATA:

		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",

			       req->rq_pack_bulk ? "missing" : "unexpected");

			return -EPROTO;
@@ -1009,7 +1010,8 @@ int gss_cli_ctx_unseal(struct ptlrpc_cli_ctx *ctx, 
	case PTLRPC_GSS_PROC_DATA:

		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",

			       req->rq_pack_bulk ? "missing" : "unexpected");

			return -EPROTO;

drivers/staging/lustre/lustre/ptlrpc/niobuf.c

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ static int ptl_send_buf(lnet_handle_md_t *mdh, void *base, int len, 
	md.eq_handle = ptlrpc_eq_h;



	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 */

		ack = LNET_NOACK_REQ;

	}

drivers/staging/lustre/lustre/ptlrpc/service.c

+1 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ static int ptlrpc_at_send_early_reply(struct ptlrpc_request *req) 
		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, "

			  "but no AT support");

		return -ENOSYS;

drivers/staging/lustre/lustre/ptlrpc/ptlrpc_internal.h

+4 −4

File changed.

Contains only whitespace changes.