mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 08:51:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: ptlrpc: fix indentation

Browse Source 
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: Kristina Martsenko <kristina.martsenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kristina Martsenko
2013-11-11 21:35:03 +02:00
committed by Greg Kroah-Hartman
parent 998d2766fe
commit 532118c080
3 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,15 +72,15 @@ static void __import_set_state(struct obd_import *imp,
}
/* A CLOSED import should remain so. */
#define IMPORT_SET_STATE_NOLOCK(imp, state) \
do { \
if (imp->imp_state != LUSTRE_IMP_CLOSED) { \
CDEBUG(D_HA, "%p %s: changing import state from %s to %s\n", \
imp, obd2cli_tgt(imp->imp_obd), \
ptlrpc_import_state_name(imp->imp_state), \
ptlrpc_import_state_name(state)); \
__import_set_state(imp, state); \
} \
#define IMPORT_SET_STATE_NOLOCK(imp, state) \
do { \
if (imp->imp_state != LUSTRE_IMP_CLOSED) { \
CDEBUG(D_HA, "%p %s: changing import state from %s to %s\n", \
imp, obd2cli_tgt(imp->imp_obd), \
ptlrpc_import_state_name(imp->imp_state), \
ptlrpc_import_state_name(state)); \
__import_set_state(imp, state); \
} \
} while (0)
#define IMPORT_SET_STATE(imp, state) \
@@ -1135,9 +1135,11 @@ static int ptlrpc_connect_interpret(const struct lu_env *env,
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 "

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

@@ -636,8 +636,8 @@ static inline int lustre_unpack_ptlrpc_body_v2(struct ptlrpc_request *req,
}
if ((pb->pb_version & ~LUSTRE_VERSION_MASK) != PTLRPC_MSG_VERSION) {
CERROR("wrong lustre_msg version %08x\n", pb->pb_version);
return -EINVAL;
CERROR("wrong lustre_msg version %08x\n", pb->pb_version);
return -EINVAL;
}
if (!inout)

21
drivers/staging/lustre/lustre/ptlrpc/service.c
View File

@@ -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,13 +1969,14 @@ ptlrpc_server_handle_request(struct ptlrpc_service_part *svcpt,
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.",
cfs_time_sub(request->rq_deadline,
request->rq_arrival_time.tv_sec),
cfs_time_sub(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.",
cfs_time_sub(request->rq_deadline,
request->rq_arrival_time.tv_sec),
cfs_time_sub(cfs_time_current_sec(),
request->rq_deadline));
}
do_gettimeofday(&work_end);