* [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters
@ 2015-02-27 22:57 Haneen Mohammed
2015-03-01 0:39 ` [PATCH v2] Staging: lustre: " Haneen Mohammed
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Haneen Mohammed @ 2015-02-27 22:57 UTC (permalink / raw)
To: outreachy-kernel; +Cc: Haneen Mohammed
This patch splits line over 80 characters addressing checkpatch.pl
warning.
Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com>
---
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 32 +++++++++++++++--------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
index 287da32..a913c01 100644
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c
@@ -102,7 +102,10 @@ int ldlm_expired_completion_wait(void *data)
lock->l_last_activity,
cfs_time_sub(get_seconds(),
lock->l_last_activity));
- LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep",
+ LDLM_DEBUG(lock,
+ "lock timed out (enqueued at "
+ CFS_TIME_T ", " CFS_DURATION_T
+ "s ago); not entering recovery in server code, just going back to sleep",
lock->l_last_activity,
cfs_time_sub(get_seconds(),
lock->l_last_activity));
@@ -190,7 +193,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data)
return ldlm_completion_tail(lock);
}
- LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward");
+ LDLM_DEBUG(lock,
+ "client-side enqueue returned a blocked lock, going forward");
ldlm_reprocess_all(lock->l_resource);
return 0;
}
@@ -238,7 +242,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data)
return 0;
}
- LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping");
+ LDLM_DEBUG(lock,
+ "client-side enqueue returned a blocked lock, sleeping");
noreproc:
@@ -320,7 +325,8 @@ int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock)
if (rc < 0)
CERROR("ldlm_cli_cancel: %d\n", rc);
} else {
- LDLM_DEBUG(lock, "Lock still has references, will be cancelled later");
+ LDLM_DEBUG(lock,
+ "Lock still has references, will be cancelled later");
}
return 0;
}
@@ -551,7 +557,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
rc = size;
goto cleanup;
} else if (unlikely(size > lvb_len)) {
- LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d",
+ LDLM_ERROR(lock,
+ "Replied LVB is larger than expectation, expected = %d, replied = %d",
lvb_len, size);
rc = -EINVAL;
goto cleanup;
@@ -1104,7 +1111,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock)
unlock_res_and_lock(lock);
if (local_only) {
- CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n");
+ CDEBUG(D_DLMTRACE,
+ "not sending request (at caller's instruction)\n");
rc = LDLM_FL_LOCAL_ONLY;
}
ldlm_lock_cancel(lock);
@@ -1219,9 +1227,10 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels,
rc = ptlrpc_queue_wait(req);
}
if (rc == LUSTRE_ESTALE) {
- CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n",
- libcfs_nid2str(req->rq_import->
- imp_connection->c_peer.nid));
+ CDEBUG(D_DLMTRACE,
+ "client/server (nid %s) out of sync -- not fatal\n",
+ libcfs_nid2str(req->rq_import->
+ imp_connection->c_peer.nid));
rc = 0;
} else if (rc == -ETIMEDOUT && /* check there was no reconnect*/
req->rq_import_generation == imp->imp_generation) {
@@ -2244,8 +2253,9 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns)
int canceled;
LIST_HEAD(cancels);
- CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",
- ldlm_ns_name(ns), ns->ns_nr_unused);
+ CDEBUG(D_DLMTRACE,
+ "Dropping as many unused locks as possible before replay for namespace %s (%d)\n",
+ ldlm_ns_name(ns), ns->ns_nr_unused);
/* We don't need to care whether or not LRU resize is enabled
* because the LDLM_CANCEL_NO_WAIT policy doesn't use the
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v2] Staging: lustre: Fix line over 80 characters 2015-02-27 22:57 [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters Haneen Mohammed @ 2015-03-01 0:39 ` Haneen Mohammed 2015-03-01 12:40 ` [Outreachy kernel] " Julia Lawall 2015-03-02 0:31 ` [Outreachy kernel] [PATCH] Staging: lustre: lustre: ldlm: " Greg KH 2015-03-04 11:34 ` [PATCH v5] Staging: lustre: " Haneen Mohammed 2 siblings, 1 reply; 6+ messages in thread From: Haneen Mohammed @ 2015-03-01 0:39 UTC (permalink / raw) To: outreachy-kernel; +Cc: Haneen Mohammed This patch splits line over 80 characters addressing checkpatch.pl warning. Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com> --- v2: edit subject line drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 32 +++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index 287da32..a913c01 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -102,7 +102,10 @@ int ldlm_expired_completion_wait(void *data) lock->l_last_activity, cfs_time_sub(get_seconds(), lock->l_last_activity)); - LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep", + LDLM_DEBUG(lock, + "lock timed out (enqueued at " + CFS_TIME_T ", " CFS_DURATION_T + "s ago); not entering recovery in server code, just going back to sleep", lock->l_last_activity, cfs_time_sub(get_seconds(), lock->l_last_activity)); @@ -190,7 +193,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) return ldlm_completion_tail(lock); } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, going forward"); ldlm_reprocess_all(lock->l_resource); return 0; } @@ -238,7 +242,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) return 0; } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, sleeping"); noreproc: @@ -320,7 +325,8 @@ int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock) if (rc < 0) CERROR("ldlm_cli_cancel: %d\n", rc); } else { - LDLM_DEBUG(lock, "Lock still has references, will be cancelled later"); + LDLM_DEBUG(lock, + "Lock still has references, will be cancelled later"); } return 0; } @@ -551,7 +557,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, rc = size; goto cleanup; } else if (unlikely(size > lvb_len)) { - LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d", + LDLM_ERROR(lock, + "Replied LVB is larger than expectation, expected = %d, replied = %d", lvb_len, size); rc = -EINVAL; goto cleanup; @@ -1104,7 +1111,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock) unlock_res_and_lock(lock); if (local_only) { - CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n"); + CDEBUG(D_DLMTRACE, + "not sending request (at caller's instruction)\n"); rc = LDLM_FL_LOCAL_ONLY; } ldlm_lock_cancel(lock); @@ -1219,9 +1227,10 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels, rc = ptlrpc_queue_wait(req); } if (rc == LUSTRE_ESTALE) { - CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n", - libcfs_nid2str(req->rq_import-> - imp_connection->c_peer.nid)); + CDEBUG(D_DLMTRACE, + "client/server (nid %s) out of sync -- not fatal\n", + libcfs_nid2str(req->rq_import-> + imp_connection->c_peer.nid)); rc = 0; } else if (rc == -ETIMEDOUT && /* check there was no reconnect*/ req->rq_import_generation == imp->imp_generation) { @@ -2244,8 +2253,9 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) int canceled; LIST_HEAD(cancels); - CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", - ldlm_ns_name(ns), ns->ns_nr_unused); + CDEBUG(D_DLMTRACE, + "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", + ldlm_ns_name(ns), ns->ns_nr_unused); /* We don't need to care whether or not LRU resize is enabled * because the LDLM_CANCEL_NO_WAIT policy doesn't use the -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH v2] Staging: lustre: Fix line over 80 characters 2015-03-01 0:39 ` [PATCH v2] Staging: lustre: " Haneen Mohammed @ 2015-03-01 12:40 ` Julia Lawall 0 siblings, 0 replies; 6+ messages in thread From: Julia Lawall @ 2015-03-01 12:40 UTC (permalink / raw) To: Haneen Mohammed; +Cc: outreachy-kernel > - LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep", > + LDLM_DEBUG(lock, > + "lock timed out (enqueued at " > + CFS_TIME_T ", " CFS_DURATION_T > + "s ago); not entering recovery in server code, just going back to sleep", This does not look nice at all. Line the second argment up with the left side of the first argument Then you will also have more space. julia > lock->l_last_activity, > cfs_time_sub(get_seconds(), > lock->l_last_activity)); > @@ -190,7 +193,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) > return ldlm_completion_tail(lock); > } > > - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); > + LDLM_DEBUG(lock, > + "client-side enqueue returned a blocked lock, going forward"); > ldlm_reprocess_all(lock->l_resource); > return 0; > } > @@ -238,7 +242,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) > return 0; > } > > - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping"); > + LDLM_DEBUG(lock, > + "client-side enqueue returned a blocked lock, sleeping"); > > noreproc: > > @@ -320,7 +325,8 @@ int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock) > if (rc < 0) > CERROR("ldlm_cli_cancel: %d\n", rc); > } else { > - LDLM_DEBUG(lock, "Lock still has references, will be cancelled later"); > + LDLM_DEBUG(lock, > + "Lock still has references, will be cancelled later"); > } > return 0; > } > @@ -551,7 +557,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, > rc = size; > goto cleanup; > } else if (unlikely(size > lvb_len)) { > - LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d", > + LDLM_ERROR(lock, > + "Replied LVB is larger than expectation, expected = %d, replied = %d", > lvb_len, size); > rc = -EINVAL; > goto cleanup; > @@ -1104,7 +1111,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock) > unlock_res_and_lock(lock); > > if (local_only) { > - CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n"); > + CDEBUG(D_DLMTRACE, > + "not sending request (at caller's instruction)\n"); > rc = LDLM_FL_LOCAL_ONLY; > } > ldlm_lock_cancel(lock); > @@ -1219,9 +1227,10 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels, > rc = ptlrpc_queue_wait(req); > } > if (rc == LUSTRE_ESTALE) { > - CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n", > - libcfs_nid2str(req->rq_import-> > - imp_connection->c_peer.nid)); > + CDEBUG(D_DLMTRACE, > + "client/server (nid %s) out of sync -- not fatal\n", > + libcfs_nid2str(req->rq_import-> > + imp_connection->c_peer.nid)); > rc = 0; > } else if (rc == -ETIMEDOUT && /* check there was no reconnect*/ > req->rq_import_generation == imp->imp_generation) { > @@ -2244,8 +2253,9 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) > int canceled; > LIST_HEAD(cancels); > > - CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", > - ldlm_ns_name(ns), ns->ns_nr_unused); > + CDEBUG(D_DLMTRACE, > + "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", > + ldlm_ns_name(ns), ns->ns_nr_unused); > > /* We don't need to care whether or not LRU resize is enabled > * because the LDLM_CANCEL_NO_WAIT policy doesn't use the > -- > 1.9.1 > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1425170361-22321-1-git-send-email-hamohammed.sa%40gmail.com. > For more options, visit https://groups.google.com/d/optout. > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters 2015-02-27 22:57 [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters Haneen Mohammed 2015-03-01 0:39 ` [PATCH v2] Staging: lustre: " Haneen Mohammed @ 2015-03-02 0:31 ` Greg KH 2015-03-04 11:34 ` [PATCH v5] Staging: lustre: " Haneen Mohammed 2 siblings, 0 replies; 6+ messages in thread From: Greg KH @ 2015-03-02 0:31 UTC (permalink / raw) To: Haneen Mohammed; +Cc: outreachy-kernel On Sat, Feb 28, 2015 at 01:57:48AM +0300, Haneen Mohammed wrote: > This patch splits line over 80 characters addressing checkpatch.pl > warning. > > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com> > --- > drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 32 +++++++++++++++-------- > 1 file changed, 21 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > index 287da32..a913c01 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > @@ -102,7 +102,10 @@ int ldlm_expired_completion_wait(void *data) > lock->l_last_activity, > cfs_time_sub(get_seconds(), > lock->l_last_activity)); > - LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep", > + LDLM_DEBUG(lock, > + "lock timed out (enqueued at " > + CFS_TIME_T ", " CFS_DURATION_T > + "s ago); not entering recovery in server code, just going back to sleep", > lock->l_last_activity, > cfs_time_sub(get_seconds(), > lock->l_last_activity)); These are "debugging" lines, and should all be fine. Please work to get rid of LDLM_DEBUG() and use the "normal" in-kernel debugging functions instead. thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v5] Staging: lustre: line over 80 characters 2015-02-27 22:57 [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters Haneen Mohammed 2015-03-01 0:39 ` [PATCH v2] Staging: lustre: " Haneen Mohammed 2015-03-02 0:31 ` [Outreachy kernel] [PATCH] Staging: lustre: lustre: ldlm: " Greg KH @ 2015-03-04 11:34 ` Haneen Mohammed 2015-03-06 23:41 ` [Outreachy kernel] " Greg KH 2 siblings, 1 reply; 6+ messages in thread From: Haneen Mohammed @ 2015-03-04 11:34 UTC (permalink / raw) To: outreachy-kernel; +Cc: Haneen Mohammed This patch splits line over 80 characters addressing checkpatch.pl warning. Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com> --- v5: address identation problem v4: solve problems with identation drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 33 +++++++++++++++-------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index 53226b8..ddfae44 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -102,10 +102,13 @@ int ldlm_expired_completion_wait(void *data) lock->l_last_activity, cfs_time_sub(get_seconds(), lock->l_last_activity)); - LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep", + LDLM_DEBUG(lock, + "lock timed out (enqueued at " + CFS_TIME_T ", " CFS_DURATION_T + "s ago); not entering recovery in server code, just going back to sleep", lock->l_last_activity, cfs_time_sub(get_seconds(), - lock->l_last_activity)); + lock->l_last_activity)); if (cfs_time_after(cfs_time_current(), next_dump)) { last_dump = next_dump; next_dump = cfs_time_shift(300); @@ -190,7 +193,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) return ldlm_completion_tail(lock); } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, going forward"); ldlm_reprocess_all(lock->l_resource); return 0; } @@ -238,7 +242,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) return 0; } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, sleeping"); noreproc: @@ -320,7 +325,8 @@ int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock) if (rc < 0) CERROR("ldlm_cli_cancel: %d\n", rc); } else { - LDLM_DEBUG(lock, "Lock still has references, will be cancelled later"); + LDLM_DEBUG(lock, + "Lock still has references, will be cancelled later"); } return 0; } @@ -551,7 +557,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, rc = size; goto cleanup; } else if (unlikely(size > lvb_len)) { - LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d", + LDLM_ERROR(lock, + "Replied LVB is larger than expectation, expected = %d, replied = %d", lvb_len, size); rc = -EINVAL; goto cleanup; @@ -1104,7 +1111,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock) unlock_res_and_lock(lock); if (local_only) { - CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n"); + CDEBUG(D_DLMTRACE, + "not sending request (at caller's instruction)\n"); rc = LDLM_FL_LOCAL_ONLY; } ldlm_lock_cancel(lock); @@ -1219,7 +1227,8 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels, rc = ptlrpc_queue_wait(req); } if (rc == LUSTRE_ESTALE) { - CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n", + CDEBUG(D_DLMTRACE, + "client/server (nid %s) out of sync -- not fatal\n", libcfs_nid2str(req->rq_import-> imp_connection->c_peer.nid)); rc = 0; @@ -2243,7 +2252,8 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) int canceled; LIST_HEAD(cancels); - CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", + CDEBUG(D_DLMTRACE, + "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", ldlm_ns_name(ns), ns->ns_nr_unused); /* We don't need to care whether or not LRU resize is enabled @@ -2252,8 +2262,9 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) canceled = ldlm_cancel_lru_local(ns, &cancels, ns->ns_nr_unused, 0, LCF_LOCAL, LDLM_CANCEL_NO_WAIT); - CDEBUG(D_DLMTRACE, "Canceled %d unused locks from namespace %s\n", - canceled, ldlm_ns_name(ns)); + CDEBUG(D_DLMTRACE, + "Canceled %d unused locks from namespace %s\n", + canceled, ldlm_ns_name(ns)); } int ldlm_replay_locks(struct obd_import *imp) -- 1.9.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Outreachy kernel] [PATCH v5] Staging: lustre: line over 80 characters 2015-03-04 11:34 ` [PATCH v5] Staging: lustre: " Haneen Mohammed @ 2015-03-06 23:41 ` Greg KH 0 siblings, 0 replies; 6+ messages in thread From: Greg KH @ 2015-03-06 23:41 UTC (permalink / raw) To: Haneen Mohammed; +Cc: outreachy-kernel On Wed, Mar 04, 2015 at 02:34:50PM +0300, Haneen Mohammed wrote: > This patch splits line over 80 characters addressing checkpatch.pl warning. > > Signed-off-by: Haneen Mohammed <hamohammed.sa@gmail.com> > --- > v5: address identation problem > v4: solve problems with identation > > drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 33 +++++++++++++++-------- > 1 file changed, 22 insertions(+), 11 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > index 53226b8..ddfae44 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c > @@ -102,10 +102,13 @@ int ldlm_expired_completion_wait(void *data) > lock->l_last_activity, > cfs_time_sub(get_seconds(), > lock->l_last_activity)); > - LDLM_DEBUG(lock, "lock timed out (enqueued at " CFS_TIME_T ", " CFS_DURATION_T "s ago); not entering recovery in server code, just going back to sleep", > + LDLM_DEBUG(lock, > + "lock timed out (enqueued at " > + CFS_TIME_T ", " CFS_DURATION_T > + "s ago); not entering recovery in server code, just going back to sleep", > lock->l_last_activity, > cfs_time_sub(get_seconds(), > - lock->l_last_activity)); > + lock->l_last_activity)); > if (cfs_time_after(cfs_time_current(), next_dump)) { > last_dump = next_dump; > next_dump = cfs_time_shift(300); > @@ -190,7 +193,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) > return ldlm_completion_tail(lock); > } > > - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); > + LDLM_DEBUG(lock, > + "client-side enqueue returned a blocked lock, going forward"); > ldlm_reprocess_all(lock->l_resource); > return 0; > } > @@ -238,7 +242,8 @@ int ldlm_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) > return 0; > } > > - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, sleeping"); > + LDLM_DEBUG(lock, > + "client-side enqueue returned a blocked lock, sleeping"); > > noreproc: > > @@ -320,7 +325,8 @@ int ldlm_blocking_ast_nocheck(struct ldlm_lock *lock) > if (rc < 0) > CERROR("ldlm_cli_cancel: %d\n", rc); > } else { > - LDLM_DEBUG(lock, "Lock still has references, will be cancelled later"); > + LDLM_DEBUG(lock, > + "Lock still has references, will be cancelled later"); > } > return 0; > } > @@ -551,7 +557,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, > rc = size; > goto cleanup; > } else if (unlikely(size > lvb_len)) { > - LDLM_ERROR(lock, "Replied LVB is larger than expectation, expected = %d, replied = %d", > + LDLM_ERROR(lock, > + "Replied LVB is larger than expectation, expected = %d, replied = %d", > lvb_len, size); > rc = -EINVAL; > goto cleanup; > @@ -1104,7 +1111,8 @@ static __u64 ldlm_cli_cancel_local(struct ldlm_lock *lock) > unlock_res_and_lock(lock); > > if (local_only) { > - CDEBUG(D_DLMTRACE, "not sending request (at caller's instruction)\n"); > + CDEBUG(D_DLMTRACE, > + "not sending request (at caller's instruction)\n"); > rc = LDLM_FL_LOCAL_ONLY; > } > ldlm_lock_cancel(lock); > @@ -1219,7 +1227,8 @@ int ldlm_cli_cancel_req(struct obd_export *exp, struct list_head *cancels, > rc = ptlrpc_queue_wait(req); > } > if (rc == LUSTRE_ESTALE) { > - CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync -- not fatal\n", > + CDEBUG(D_DLMTRACE, > + "client/server (nid %s) out of sync -- not fatal\n", > libcfs_nid2str(req->rq_import-> > imp_connection->c_peer.nid)); > rc = 0; > @@ -2243,7 +2252,8 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) > int canceled; > LIST_HEAD(cancels); > > - CDEBUG(D_DLMTRACE, "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", > + CDEBUG(D_DLMTRACE, > + "Dropping as many unused locks as possible before replay for namespace %s (%d)\n", > ldlm_ns_name(ns), ns->ns_nr_unused); > > /* We don't need to care whether or not LRU resize is enabled > @@ -2252,8 +2262,9 @@ static void ldlm_cancel_unused_locks_for_replay(struct ldlm_namespace *ns) > canceled = ldlm_cancel_lru_local(ns, &cancels, ns->ns_nr_unused, 0, > LCF_LOCAL, LDLM_CANCEL_NO_WAIT); > > - CDEBUG(D_DLMTRACE, "Canceled %d unused locks from namespace %s\n", > - canceled, ldlm_ns_name(ns)); > + CDEBUG(D_DLMTRACE, > + "Canceled %d unused locks from namespace %s\n", > + canceled, ldlm_ns_name(ns)); This last one didn't need to be changed, why modify it? Also, the long-term goal here is to get rid of these custom debug/log macros, please move toward using the correct dev_* or pr_* functions instead of these macros. thanks, greg k-h ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-07 10:56 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-02-27 22:57 [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters Haneen Mohammed 2015-03-01 0:39 ` [PATCH v2] Staging: lustre: " Haneen Mohammed 2015-03-01 12:40 ` [Outreachy kernel] " Julia Lawall 2015-03-02 0:31 ` [Outreachy kernel] [PATCH] Staging: lustre: lustre: ldlm: " Greg KH 2015-03-04 11:34 ` [PATCH v5] Staging: lustre: " Haneen Mohammed 2015-03-06 23:41 ` [Outreachy kernel] " Greg KH
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.