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

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

staging: lustre: ptlrpc: fix indentation 



Fix the following type of checkpatch warning to comply with coding
style:
WARNING: suspect code indent for conditional statements

Also join a debug string split across lines, as it was on the same lines
as the other changes anyway. And reformat some comments in the kernel
coding style for the same reason.

Signed-off-by: default avatarKristina Martsenko <kristina.martsenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 998d2766

drivers/staging/lustre/lustre/ptlrpc/import.c

+14 −12
Original line number Diff line number Diff line
@@ -1135,9 +1135,11 @@ out: 
			if (ocd &&

			    (ocd->ocd_connect_flags & OBD_CONNECT_VERSION) &&

			    (ocd->ocd_version != LUSTRE_VERSION_CODE)) {

			   /* Actually servers are only supposed to refuse

			      connection from liblustre clients, so we should

			      never see this from VFS context */

				/*

				 * Actually servers are only supposed to refuse

				 * connection from liblustre clients, so we

				 * should never see this from VFS context

				 */

				LCONSOLE_ERROR_MSG(0x16a, "Server %s version "

					"(%d.%d.%d.%d)"

					" refused connection from this client "

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

+12 −9
Original line number Diff line number Diff line
@@ -1115,8 +1115,10 @@ static int ptlrpc_check_req(struct ptlrpc_request *req) 
	}

	if (unlikely(req->rq_export->exp_obd &&

		     req->rq_export->exp_obd->obd_fail)) {

	     /* Failing over, don't handle any more reqs, send

		error response instead. */

		/*

		 * Failing over, don't handle any more reqs, send

		 * error response instead.

		 */

		CDEBUG(D_RPCTRACE, "Dropping req %p for failed obd %s\n",

		       req, req->rq_export->exp_obd->obd_name);

		rc = -ENODEV;
@@ -1967,9 +1969,10 @@ put_conn: 
	lu_context_fini(&request->rq_session);



	if (unlikely(cfs_time_current_sec() > request->rq_deadline)) {

		     DEBUG_REQ(D_WARNING, request, "Request took longer "

			       "than estimated ("CFS_DURATION_T":"CFS_DURATION_T"s);"

			       " client may timeout.",

		DEBUG_REQ(D_WARNING, request,

			  "Request took longer than estimated ("

				CFS_DURATION_T":"CFS_DURATION_T

				"s); client may timeout.",

			  cfs_time_sub(request->rq_deadline,

				       request->rq_arrival_time.tv_sec),

			  cfs_time_sub(cfs_time_current_sec(),

drivers/staging/lustre/lustre/ptlrpc/pack_generic.c

+2 −2

File changed.

Contains only whitespace changes.