* [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters
@ 2017-09-15 5:55 Aastha Gupta
2017-09-15 5:55 ` [PATCH 1/8] " Aastha Gupta
` (8 more replies)
0 siblings, 9 replies; 21+ messages in thread
From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw)
To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons,
Greg Kroah-Hartman
Cc: Aastha Gupta
These patches fix checkpatch.pl warnings 'line over 80 characters' in ldlm files.
-------------------------------------------------------------------------
Aastha Gupta (8):
staging: lustre: ldlm: fix line over 80 characters
staging: lustre: ldlm: fix line over 80 characters
staging: lustre: ldlm: fix line over 80 characters
staging: lustre: ldlm: fix lines over 80 characters
staging: lustre: ldlm: fix lines over 80 characters
staging: lustre: ldlm: fix lines over 80 characters
staging: lustre: ldlm: fix lines over 80 characters
staging: lustre: ldlm: fix lines over 80 characters
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +-
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++--
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++-
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++------
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++--
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++--
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++--------
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +-
8 files changed, 67 insertions(+), 35 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 21+ messages in thread* [PATCH 1/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 2/8] " Aastha Gupta ` (7 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c index 2cc6dc2..f9b4c0a 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c @@ -207,7 +207,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, continue; if (ldlm_extent_overlap(&lck->l_req_extent, &lock->l_req_extent)) { - CDEBUG(D_ERROR, "granting conflicting lock %p %p\n", + CDEBUG(D_ERROR, + "granting conflicting lock %p %p\n", lck, lock); ldlm_resource_dump(D_ERROR, res); LBUG(); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta 2017-09-15 5:55 ` [PATCH 1/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 3/8] " Aastha Gupta ` (6 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c index cb826e9..04e1d4c 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c @@ -479,7 +479,8 @@ ldlm_flock_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"); fwd.fwd_lock = lock; obd = class_exp2obd(lock->l_conn_export); @@ -561,7 +562,8 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) mode = lock->l_granted_mode; if (ldlm_is_flock_deadlock(lock)) { - LDLM_DEBUG(lock, "client-side enqueue deadlock received"); + LDLM_DEBUG(lock, + "client-side enqueue deadlock received"); rc = -EDEADLK; } ldlm_flock_destroy(lock, mode, LDLM_FL_WAIT_NOREPROC); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 3/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta 2017-09-15 5:55 ` [PATCH 1/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 2/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 4/8] staging: lustre: ldlm: fix lines " Aastha Gupta ` (5 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h index 36808db..9776c39 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h @@ -88,7 +88,9 @@ struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client); /* ldlm_request.c */ /* Cancel lru flag, it indicates we cancel aged locks. */ enum { - LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non lru resize). */ + LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non + * lru resize). + */ LDLM_LRU_FLAG_PASSED = BIT(1), /* Cancel passed number of locks. */ LDLM_LRU_FLAG_SHRINK = BIT(2), /* Cancel locks from shrinker. */ LDLM_LRU_FLAG_LRUR = BIT(3), /* Cancel locks from lru resize. */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 4/8] staging: lustre: ldlm: fix lines over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (2 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 3/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 5/8] " Aastha Gupta ` (4 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c index b5d84f3..adfc0b4 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c @@ -1035,7 +1035,8 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) ldlm_extent_add_lock(res, lock); } else if (res->lr_type == LDLM_FLOCK) { /* - * We should not add locks to granted list in the following cases: + * We should not add locks to granted list in + * the following cases: * - this is an UNLOCK but not a real lock; * - this is a TEST lock; * - this is a F_CANCELLK lock (async flock has req_mode == 0) @@ -2051,13 +2052,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: \?\? lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: \?\? rrc=\?\? type: \?\?\? flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); va_end(args); return; } @@ -2067,7 +2071,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s [%llu->%llu] (req %llu->%llu) flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2076,8 +2081,10 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, ldlm_typename[resource->lr_type], lock->l_policy_data.l_extent.start, lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_req_extent.start, + lock->l_req_extent.end, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2087,7 +2094,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s pid: %d [%llu->%llu] flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2097,7 +2105,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_flock.pid, lock->l_policy_data.l_flock.start, lock->l_policy_data.l_flock.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; @@ -2115,7 +2124,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_inodebits.bits, atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2133,7 +2143,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, PLDLMRES(resource), atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 5/8] staging: lustre: ldlm: fix lines over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (3 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 4/8] staging: lustre: ldlm: fix lines " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 6/8] " Aastha Gupta ` (3 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index e270733..1b2dbb9 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -184,7 +184,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LASSERT(lock->l_lvb_data); if (unlikely(lock->l_lvb_len < 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", lock->l_lvb_len, lvb_len); rc = -EINVAL; goto out; @@ -598,7 +599,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0); if (!lock) { - CDEBUG(D_DLMTRACE, "callback on lock %#llx - lock disappeared\n", + CDEBUG(D_DLMTRACE, + "callback on lock %#llx - lock disappeared\n", dlm_req->lock_handle[0].cookie); rc = ldlm_callback_reply(req, -EINVAL); ldlm_callback_errmsg(req, "Operate with invalid parameter", rc, -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 6/8] staging: lustre: ldlm: fix lines over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (4 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 5/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 7/8] " Aastha Gupta ` (2 subsequent siblings) 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c index d77bf0b..24b0b7d 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c @@ -386,7 +386,8 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl) pl->pl_recalc_period; if (recalc_interval_sec <= 0) { /* DEBUG: should be re-removed after LU-4536 is fixed */ - CDEBUG(D_DLMTRACE, "%s: Negative interval(%ld), too short period(%ld)\n", + CDEBUG(D_DLMTRACE, + "%s: Negative interval(%ld), too short period(%ld)\n", pl->pl_name, (long)recalc_interval_sec, (long)pl->pl_recalc_period); @@ -415,7 +416,8 @@ static int ldlm_pool_shrink(struct ldlm_pool *pl, int nr, gfp_t gfp_mask) lprocfs_counter_add(pl->pl_stats, LDLM_POOL_SHRINK_FREED_STAT, cancel); - CDEBUG(D_DLMTRACE, "%s: request to shrink %d locks, shrunk %d\n", + CDEBUG(D_DLMTRACE, + "%s: request to shrink %d locks, shrunk %d\n", pl->pl_name, nr, cancel); } } -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 7/8] staging: lustre: ldlm: fix lines over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (5 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 6/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 5:55 ` [PATCH 8/8] " Aastha Gupta 2017-09-15 6:16 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line " Julia Lawall 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++--------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index f3bf238..4660aa7 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -121,7 +121,8 @@ static int ldlm_expired_completion_wait(void *data) if (!lock->l_conn_export) { static unsigned long next_dump, last_dump; - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity)); @@ -139,7 +140,8 @@ static int ldlm_expired_completion_wait(void *data) obd = lock->l_conn_export->exp_obd; imp = obd->u.cli.cl_import; ptlrpc_fail_import(imp, lwd->lwd_conn_cnt); - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity), obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid); @@ -218,7 +220,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) return ldlm_completion_tail(lock, data); } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, going forward"); return 0; } EXPORT_SYMBOL(ldlm_completion_ast_async); @@ -264,7 +267,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: @@ -414,7 +418,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; @@ -473,7 +478,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, if (!ldlm_res_eq(&reply->lock_desc.l_resource.lr_name, &lock->l_resource->lr_name)) { - CDEBUG(D_INFO, "remote intent success, locking " DLDLMRES + CDEBUG(D_INFO, + "remote intent success, locking " DLDLMRES " instead of " DLDLMRES "\n", PLDLMRES(&reply->lock_desc.l_resource), PLDLMRES(lock->l_resource)); @@ -850,7 +856,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); @@ -963,7 +970,8 @@ static int ldlm_cli_cancel_req(struct obd_export *exp, 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; @@ -1363,13 +1371,14 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags) * flags & LDLM_LRU_FLAG_LRUR - use LRU resize policy (SLV from server) to * cancel not more than \a count locks; * - * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located at - * the beginning of LRU list); + * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located + * at the beginning of LRU list); * - * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according to - * memory pressure policy function; + * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according + * to memory pressure policy function; * - * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to "aged policy". + * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to + * "aged policy". * * flags & LDLM_LRU_FLAG_NO_WAIT - cancel as many unused locks as possible * (typically before replaying locks) w/o @@ -1383,7 +1392,8 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, ldlm_cancel_lru_policy_t pf; struct ldlm_lock *lock, *next; int added = 0, unused, remained; - int no_wait = flags & (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); + int no_wait = flags & + (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); spin_lock(&ns->ns_lock); unused = ns->ns_nr_unused; @@ -2034,7 +2044,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 -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 8/8] staging: lustre: ldlm: fix lines over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (6 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 7/8] " Aastha Gupta @ 2017-09-15 5:55 ` Aastha Gupta 2017-09-15 6:16 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line " Julia Lawall 8 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 5:55 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c index c2ddf73..c374f14 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c @@ -1358,7 +1358,8 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res) LDLM_DEBUG_LIMIT(level, lock, "###"); if (!(level & D_CANTMASK) && ++granted > ldlm_dump_granted_max) { - CDEBUG(level, "only dump %d granted locks to avoid DDOS.\n", + CDEBUG(level, + "only dump %d granted locks to avoid DDOS.\n", granted); break; } -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta ` (7 preceding siblings ...) 2017-09-15 5:55 ` [PATCH 8/8] " Aastha Gupta @ 2017-09-15 6:16 ` Julia Lawall 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta 2017-09-15 7:29 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Dilger, Andreas 8 siblings, 2 replies; 21+ messages in thread From: Julia Lawall @ 2017-09-15 6:16 UTC (permalink / raw) To: Aastha Gupta Cc: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman On Fri, 15 Sep 2017, Aastha Gupta wrote: > These patches fix checkpatch.pl warnings 'line over 80 characters' in ldlm files. > > ------------------------------------------------------------------------- > > Aastha Gupta (8): > staging: lustre: ldlm: fix line over 80 characters > staging: lustre: ldlm: fix line over 80 characters > staging: lustre: ldlm: fix line over 80 characters > staging: lustre: ldlm: fix lines over 80 characters > staging: lustre: ldlm: fix lines over 80 characters > staging: lustre: ldlm: fix lines over 80 characters > staging: lustre: ldlm: fix lines over 80 characters > staging: lustre: ldlm: fix lines over 80 characters Your patches all have the same subjects. That is not allowed. Eihter put them all into one patch or add more information about the file name in the subject line. But don't include .h or .c julia > > drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +- > drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++-- > drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++- > drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++------ > drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++-- > drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++-- > drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++-------- > drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +- > 8 files changed, 67 insertions(+), 35 deletions(-) > > -- > 2.7.4 > > -- > 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/cover.1505454643.git.aastha.gupta4104%40gmail.com. > For more options, visit https://groups.google.com/d/optout. > ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v2 0/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 6:16 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line " Julia Lawall @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 1/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_extent Aastha Gupta ` (7 more replies) 2017-09-15 7:29 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Dilger, Andreas 1 sibling, 8 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta These patches fix checkpatch.pl warnings 'line over 80 characters' in ldlm files. Changes in v2: - edited commit messages to include the information about the file name Aastha Gupta (8): staging: lustre: ldlm: fix line over 80 characters in ldlm_extent staging: lustre: ldlm: fix line over 80 characters in ldlm_flock staging: lustre: ldlm: fix line over 80 characters in ldlm_internal staging: lustre: ldlm: fix lines over 80 characters in ldlm_lock staging: lustre: ldlm: fix lines over 80 characters in ldlm_lockd staging: lustre: ldlm: fix lines over 80 characters in ldlm_pool staging: lustre: ldlm: fix lines over 80 characters in ldlm_request staging: lustre: ldlm: fix lines over 80 characters in ldlm_resource drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++------ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++-------- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +- 8 files changed, 67 insertions(+), 35 deletions(-) -- 2.7.4 ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v2 1/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_extent 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 2/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_flock Aastha Gupta ` (6 subsequent siblings) 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c index 2cc6dc2..f9b4c0a 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c @@ -207,7 +207,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, continue; if (ldlm_extent_overlap(&lck->l_req_extent, &lock->l_req_extent)) { - CDEBUG(D_ERROR, "granting conflicting lock %p %p\n", + CDEBUG(D_ERROR, + "granting conflicting lock %p %p\n", lck, lock); ldlm_resource_dump(D_ERROR, res); LBUG(); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 2/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_flock 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 1/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_extent Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 3/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_internal Aastha Gupta ` (5 subsequent siblings) 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c index cb826e9..04e1d4c 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c @@ -479,7 +479,8 @@ ldlm_flock_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"); fwd.fwd_lock = lock; obd = class_exp2obd(lock->l_conn_export); @@ -561,7 +562,8 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) mode = lock->l_granted_mode; if (ldlm_is_flock_deadlock(lock)) { - LDLM_DEBUG(lock, "client-side enqueue deadlock received"); + LDLM_DEBUG(lock, + "client-side enqueue deadlock received"); rc = -EDEADLK; } ldlm_flock_destroy(lock, mode, LDLM_FL_WAIT_NOREPROC); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 3/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_internal 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 1/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_extent Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 2/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_flock Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 4/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lock Aastha Gupta ` (4 subsequent siblings) 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h index 36808db..9776c39 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h @@ -88,7 +88,9 @@ struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client); /* ldlm_request.c */ /* Cancel lru flag, it indicates we cancel aged locks. */ enum { - LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non lru resize). */ + LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non + * lru resize). + */ LDLM_LRU_FLAG_PASSED = BIT(1), /* Cancel passed number of locks. */ LDLM_LRU_FLAG_SHRINK = BIT(2), /* Cancel locks from shrinker. */ LDLM_LRU_FLAG_LRUR = BIT(3), /* Cancel locks from lru resize. */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 4/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lock 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta ` (2 preceding siblings ...) 2017-09-15 6:38 ` [PATCH v2 3/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_internal Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 5/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lockd Aastha Gupta ` (3 subsequent siblings) 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c index b5d84f3..adfc0b4 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c @@ -1035,7 +1035,8 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) ldlm_extent_add_lock(res, lock); } else if (res->lr_type == LDLM_FLOCK) { /* - * We should not add locks to granted list in the following cases: + * We should not add locks to granted list in + * the following cases: * - this is an UNLOCK but not a real lock; * - this is a TEST lock; * - this is a F_CANCELLK lock (async flock has req_mode == 0) @@ -2051,13 +2052,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: \?\? lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: \?\? rrc=\?\? type: \?\?\? flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); va_end(args); return; } @@ -2067,7 +2071,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s [%llu->%llu] (req %llu->%llu) flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2076,8 +2081,10 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, ldlm_typename[resource->lr_type], lock->l_policy_data.l_extent.start, lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_req_extent.start, + lock->l_req_extent.end, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2087,7 +2094,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s pid: %d [%llu->%llu] flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2097,7 +2105,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_flock.pid, lock->l_policy_data.l_flock.start, lock->l_policy_data.l_flock.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; @@ -2115,7 +2124,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_inodebits.bits, atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2133,7 +2143,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, PLDLMRES(resource), atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 5/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lockd 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta ` (3 preceding siblings ...) 2017-09-15 6:38 ` [PATCH v2 4/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lock Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 6/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_pool Aastha Gupta ` (2 subsequent siblings) 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index e270733..1b2dbb9 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -184,7 +184,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LASSERT(lock->l_lvb_data); if (unlikely(lock->l_lvb_len < 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", lock->l_lvb_len, lvb_len); rc = -EINVAL; goto out; @@ -598,7 +599,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0); if (!lock) { - CDEBUG(D_DLMTRACE, "callback on lock %#llx - lock disappeared\n", + CDEBUG(D_DLMTRACE, + "callback on lock %#llx - lock disappeared\n", dlm_req->lock_handle[0].cookie); rc = ldlm_callback_reply(req, -EINVAL); ldlm_callback_errmsg(req, "Operate with invalid parameter", rc, -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 6/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_pool 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta ` (4 preceding siblings ...) 2017-09-15 6:38 ` [PATCH v2 5/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lockd Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 7/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_request Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 8/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_resource Aastha Gupta 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c index d77bf0b..24b0b7d 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c @@ -386,7 +386,8 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl) pl->pl_recalc_period; if (recalc_interval_sec <= 0) { /* DEBUG: should be re-removed after LU-4536 is fixed */ - CDEBUG(D_DLMTRACE, "%s: Negative interval(%ld), too short period(%ld)\n", + CDEBUG(D_DLMTRACE, + "%s: Negative interval(%ld), too short period(%ld)\n", pl->pl_name, (long)recalc_interval_sec, (long)pl->pl_recalc_period); @@ -415,7 +416,8 @@ static int ldlm_pool_shrink(struct ldlm_pool *pl, int nr, gfp_t gfp_mask) lprocfs_counter_add(pl->pl_stats, LDLM_POOL_SHRINK_FREED_STAT, cancel); - CDEBUG(D_DLMTRACE, "%s: request to shrink %d locks, shrunk %d\n", + CDEBUG(D_DLMTRACE, + "%s: request to shrink %d locks, shrunk %d\n", pl->pl_name, nr, cancel); } } -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 7/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_request 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta ` (5 preceding siblings ...) 2017-09-15 6:38 ` [PATCH v2 6/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_pool Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 8/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_resource Aastha Gupta 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++--------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index f3bf238..4660aa7 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -121,7 +121,8 @@ static int ldlm_expired_completion_wait(void *data) if (!lock->l_conn_export) { static unsigned long next_dump, last_dump; - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity)); @@ -139,7 +140,8 @@ static int ldlm_expired_completion_wait(void *data) obd = lock->l_conn_export->exp_obd; imp = obd->u.cli.cl_import; ptlrpc_fail_import(imp, lwd->lwd_conn_cnt); - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity), obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid); @@ -218,7 +220,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) return ldlm_completion_tail(lock, data); } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, going forward"); return 0; } EXPORT_SYMBOL(ldlm_completion_ast_async); @@ -264,7 +267,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: @@ -414,7 +418,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; @@ -473,7 +478,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, if (!ldlm_res_eq(&reply->lock_desc.l_resource.lr_name, &lock->l_resource->lr_name)) { - CDEBUG(D_INFO, "remote intent success, locking " DLDLMRES + CDEBUG(D_INFO, + "remote intent success, locking " DLDLMRES " instead of " DLDLMRES "\n", PLDLMRES(&reply->lock_desc.l_resource), PLDLMRES(lock->l_resource)); @@ -850,7 +856,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); @@ -963,7 +970,8 @@ static int ldlm_cli_cancel_req(struct obd_export *exp, 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; @@ -1363,13 +1371,14 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags) * flags & LDLM_LRU_FLAG_LRUR - use LRU resize policy (SLV from server) to * cancel not more than \a count locks; * - * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located at - * the beginning of LRU list); + * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located + * at the beginning of LRU list); * - * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according to - * memory pressure policy function; + * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according + * to memory pressure policy function; * - * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to "aged policy". + * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to + * "aged policy". * * flags & LDLM_LRU_FLAG_NO_WAIT - cancel as many unused locks as possible * (typically before replaying locks) w/o @@ -1383,7 +1392,8 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, ldlm_cancel_lru_policy_t pf; struct ldlm_lock *lock, *next; int added = 0, unused, remained; - int no_wait = flags & (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); + int no_wait = flags & + (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); spin_lock(&ns->ns_lock); unused = ns->ns_nr_unused; @@ -2034,7 +2044,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 -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH v2 8/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_resource 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta ` (6 preceding siblings ...) 2017-09-15 6:38 ` [PATCH v2 7/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_request Aastha Gupta @ 2017-09-15 6:38 ` Aastha Gupta 7 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 6:38 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c index c2ddf73..c374f14 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c @@ -1358,7 +1358,8 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res) LDLM_DEBUG_LIMIT(level, lock, "###"); if (!(level & D_CANTMASK) && ++granted > ldlm_dump_granted_max) { - CDEBUG(level, "only dump %d granted locks to avoid DDOS.\n", + CDEBUG(level, + "only dump %d granted locks to avoid DDOS.\n", granted); break; } -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters 2017-09-15 6:16 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line " Julia Lawall 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta @ 2017-09-15 7:29 ` Dilger, Andreas 2017-09-15 7:57 ` [PATCH v3] staging: lustre: ldlm: fix lines over 80 characters in ldlm files Aastha Gupta 1 sibling, 1 reply; 21+ messages in thread From: Dilger, Andreas @ 2017-09-15 7:29 UTC (permalink / raw) To: Aastha Gupta Cc: outreachy-kernel@googlegroups.com, Drokin, Oleg, James Simmons, Julia Lawall, Greg Kroah-Hartman On Sep 15, 2017, at 00:16, Julia Lawall <julia.lawall@lip6.fr> wrote: > > > > On Fri, 15 Sep 2017, Aastha Gupta wrote: > >> These patches fix checkpatch.pl warnings 'line over 80 characters' in ldlm files. >> >> ------------------------------------------------------------------------- >> >> Aastha Gupta (8): >> staging: lustre: ldlm: fix line over 80 characters >> staging: lustre: ldlm: fix line over 80 characters >> staging: lustre: ldlm: fix line over 80 characters >> staging: lustre: ldlm: fix lines over 80 characters >> staging: lustre: ldlm: fix lines over 80 characters >> staging: lustre: ldlm: fix lines over 80 characters >> staging: lustre: ldlm: fix lines over 80 characters >> staging: lustre: ldlm: fix lines over 80 characters > > Your patches all have the same subjects. That is not allowed. Eihter put > them all into one patch or add more information about the file name in the > subject line. But don't include .h or .c Since these patches are all trivial, and do the same thing, they could just be a single patch. Cheers, Andreas > > julia > >> >> drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +- >> drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++-- >> drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++- >> drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++------ >> drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++-- >> drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++-- >> drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++-------- >> drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +- >> 8 files changed, 67 insertions(+), 35 deletions(-) >> >> -- >> 2.7.4 >> >> -- >> 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/cover.1505454643.git.aastha.gupta4104%40gmail.com. >> For more options, visit https://groups.google.com/d/optout. >> Cheers, Andreas -- Andreas Dilger Lustre Principal Architect Intel Corporation ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v3] staging: lustre: ldlm: fix lines over 80 characters in ldlm files 2017-09-15 7:29 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Dilger, Andreas @ 2017-09-15 7:57 ` Aastha Gupta 0 siblings, 0 replies; 21+ messages in thread From: Aastha Gupta @ 2017-09-15 7:57 UTC (permalink / raw) To: outreachy-kernel, Oleg Drokin, Andreas Dilger, James Simmons, Greg Kroah-Hartman Cc: Aastha Gupta This patch fixes checkpatch.pl warning: WARNING: line over 80 characters Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com> --- changes in v3: - combined all patches in the patchset into a single patch drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 3 +- drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 4 ++- drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 33 +++++++++++------ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 6 ++-- drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 41 ++++++++++++++-------- drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 3 +- 8 files changed, 67 insertions(+), 35 deletions(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c index 2cc6dc2..f9b4c0a 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c @@ -207,7 +207,8 @@ void ldlm_extent_add_lock(struct ldlm_resource *res, continue; if (ldlm_extent_overlap(&lck->l_req_extent, &lock->l_req_extent)) { - CDEBUG(D_ERROR, "granting conflicting lock %p %p\n", + CDEBUG(D_ERROR, + "granting conflicting lock %p %p\n", lck, lock); ldlm_resource_dump(D_ERROR, res); LBUG(); diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c index cb826e9..04e1d4c 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c @@ -479,7 +479,8 @@ ldlm_flock_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"); fwd.fwd_lock = lock; obd = class_exp2obd(lock->l_conn_export); @@ -561,7 +562,8 @@ ldlm_flock_completion_ast(struct ldlm_lock *lock, __u64 flags, void *data) mode = lock->l_granted_mode; if (ldlm_is_flock_deadlock(lock)) { - LDLM_DEBUG(lock, "client-side enqueue deadlock received"); + LDLM_DEBUG(lock, + "client-side enqueue deadlock received"); rc = -EDEADLK; } ldlm_flock_destroy(lock, mode, LDLM_FL_WAIT_NOREPROC); diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h index 36808db..9776c39 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_internal.h @@ -88,7 +88,9 @@ struct ldlm_namespace *ldlm_namespace_first_locked(enum ldlm_side client); /* ldlm_request.c */ /* Cancel lru flag, it indicates we cancel aged locks. */ enum { - LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non lru resize). */ + LDLM_LRU_FLAG_AGED = BIT(0), /* Cancel aged locks (non + * lru resize). + */ LDLM_LRU_FLAG_PASSED = BIT(1), /* Cancel passed number of locks. */ LDLM_LRU_FLAG_SHRINK = BIT(2), /* Cancel locks from shrinker. */ LDLM_LRU_FLAG_LRUR = BIT(3), /* Cancel locks from lru resize. */ diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c index b5d84f3..adfc0b4 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lock.c @@ -1035,7 +1035,8 @@ void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list) ldlm_extent_add_lock(res, lock); } else if (res->lr_type == LDLM_FLOCK) { /* - * We should not add locks to granted list in the following cases: + * We should not add locks to granted list in + * the following cases: * - this is an UNLOCK but not a real lock; * - this is a TEST lock; * - this is a F_CANCELLK lock (async flock has req_mode == 0) @@ -2051,13 +2052,16 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: \?\? lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: \?\? rrc=\?\? type: \?\?\? flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, - lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); + lock->l_pid, lock->l_callback_timeout, + lock->l_lvb_type); va_end(args); return; } @@ -2067,7 +2071,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s [%llu->%llu] (req %llu->%llu) flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu lvb_type: %d\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2076,8 +2081,10 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, ldlm_typename[resource->lr_type], lock->l_policy_data.l_extent.start, lock->l_policy_data.l_extent.end, - lock->l_req_extent.start, lock->l_req_extent.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_req_extent.start, + lock->l_req_extent.end, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2087,7 +2094,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, libcfs_debug_vmsg2(msgdata, fmt, args, " ns: %s lock: %p/%#llx lrc: %d/%d,%d mode: %s/%s res: " DLDLMRES " rrc: %d type: %s pid: %d [%llu->%llu] flags: %#llx nid: %s remote: %#llx expref: %d pid: %u timeout: %lu\n", ldlm_lock_to_ns_name(lock), lock, - lock->l_handle.h_cookie, atomic_read(&lock->l_refc), + lock->l_handle.h_cookie, + atomic_read(&lock->l_refc), lock->l_readers, lock->l_writers, ldlm_lockname[lock->l_granted_mode], ldlm_lockname[lock->l_req_mode], @@ -2097,7 +2105,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_flock.pid, lock->l_policy_data.l_flock.start, lock->l_policy_data.l_flock.end, - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout); break; @@ -2115,7 +2124,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, lock->l_policy_data.l_inodebits.bits, atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); @@ -2133,7 +2143,8 @@ void _ldlm_lock_debug(struct ldlm_lock *lock, PLDLMRES(resource), atomic_read(&resource->lr_refcount), ldlm_typename[resource->lr_type], - lock->l_flags, nid, lock->l_remote_handle.cookie, + lock->l_flags, nid, + lock->l_remote_handle.cookie, exp ? atomic_read(&exp->exp_refcount) : -99, lock->l_pid, lock->l_callback_timeout, lock->l_lvb_type); diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c index e270733..1b2dbb9 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c @@ -184,7 +184,8 @@ static void ldlm_handle_cp_callback(struct ptlrpc_request *req, LASSERT(lock->l_lvb_data); if (unlikely(lock->l_lvb_len < 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", lock->l_lvb_len, lvb_len); rc = -EINVAL; goto out; @@ -598,7 +599,8 @@ static int ldlm_callback_handler(struct ptlrpc_request *req) lock = ldlm_handle2lock_long(&dlm_req->lock_handle[0], 0); if (!lock) { - CDEBUG(D_DLMTRACE, "callback on lock %#llx - lock disappeared\n", + CDEBUG(D_DLMTRACE, + "callback on lock %#llx - lock disappeared\n", dlm_req->lock_handle[0].cookie); rc = ldlm_callback_reply(req, -EINVAL); ldlm_callback_errmsg(req, "Operate with invalid parameter", rc, diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c index d77bf0b..24b0b7d 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c @@ -386,7 +386,8 @@ static int ldlm_pool_recalc(struct ldlm_pool *pl) pl->pl_recalc_period; if (recalc_interval_sec <= 0) { /* DEBUG: should be re-removed after LU-4536 is fixed */ - CDEBUG(D_DLMTRACE, "%s: Negative interval(%ld), too short period(%ld)\n", + CDEBUG(D_DLMTRACE, + "%s: Negative interval(%ld), too short period(%ld)\n", pl->pl_name, (long)recalc_interval_sec, (long)pl->pl_recalc_period); @@ -415,7 +416,8 @@ static int ldlm_pool_shrink(struct ldlm_pool *pl, int nr, gfp_t gfp_mask) lprocfs_counter_add(pl->pl_stats, LDLM_POOL_SHRINK_FREED_STAT, cancel); - CDEBUG(D_DLMTRACE, "%s: request to shrink %d locks, shrunk %d\n", + CDEBUG(D_DLMTRACE, + "%s: request to shrink %d locks, shrunk %d\n", pl->pl_name, nr, cancel); } } diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c index f3bf238..4660aa7 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_request.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_request.c @@ -121,7 +121,8 @@ static int ldlm_expired_completion_wait(void *data) if (!lock->l_conn_export) { static unsigned long next_dump, last_dump; - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago); not entering recovery in server code, just going back to sleep", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity)); @@ -139,7 +140,8 @@ static int ldlm_expired_completion_wait(void *data) obd = lock->l_conn_export->exp_obd; imp = obd->u.cli.cl_import; ptlrpc_fail_import(imp, lwd->lwd_conn_cnt); - LDLM_ERROR(lock, "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", + LDLM_ERROR(lock, + "lock timed out (enqueued at %lld, %llds ago), entering recovery for %s@%s", (s64)lock->l_last_activity, (s64)(ktime_get_real_seconds() - lock->l_last_activity), obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid); @@ -218,7 +220,8 @@ int ldlm_completion_ast_async(struct ldlm_lock *lock, __u64 flags, void *data) return ldlm_completion_tail(lock, data); } - LDLM_DEBUG(lock, "client-side enqueue returned a blocked lock, going forward"); + LDLM_DEBUG(lock, + "client-side enqueue returned a blocked lock, going forward"); return 0; } EXPORT_SYMBOL(ldlm_completion_ast_async); @@ -264,7 +267,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: @@ -414,7 +418,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; @@ -473,7 +478,8 @@ int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req, if (!ldlm_res_eq(&reply->lock_desc.l_resource.lr_name, &lock->l_resource->lr_name)) { - CDEBUG(D_INFO, "remote intent success, locking " DLDLMRES + CDEBUG(D_INFO, + "remote intent success, locking " DLDLMRES " instead of " DLDLMRES "\n", PLDLMRES(&reply->lock_desc.l_resource), PLDLMRES(lock->l_resource)); @@ -850,7 +856,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); @@ -963,7 +970,8 @@ static int ldlm_cli_cancel_req(struct obd_export *exp, 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; @@ -1363,13 +1371,14 @@ ldlm_cancel_lru_policy(struct ldlm_namespace *ns, int flags) * flags & LDLM_LRU_FLAG_LRUR - use LRU resize policy (SLV from server) to * cancel not more than \a count locks; * - * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located at - * the beginning of LRU list); + * flags & LDLM_LRU_FLAG_PASSED - cancel \a count number of old locks (located + * at the beginning of LRU list); * - * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according to - * memory pressure policy function; + * flags & LDLM_LRU_FLAG_SHRINK - cancel not more than \a count locks according + * to memory pressure policy function; * - * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to "aged policy". + * flags & LDLM_LRU_FLAG_AGED - cancel \a count locks according to + * "aged policy". * * flags & LDLM_LRU_FLAG_NO_WAIT - cancel as many unused locks as possible * (typically before replaying locks) w/o @@ -1383,7 +1392,8 @@ static int ldlm_prepare_lru_list(struct ldlm_namespace *ns, ldlm_cancel_lru_policy_t pf; struct ldlm_lock *lock, *next; int added = 0, unused, remained; - int no_wait = flags & (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); + int no_wait = flags & + (LDLM_LRU_FLAG_NO_WAIT | LDLM_LRU_FLAG_LRUR_NO_WAIT); spin_lock(&ns->ns_lock); unused = ns->ns_nr_unused; @@ -2034,7 +2044,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 diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c index c2ddf73..c374f14 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_resource.c @@ -1358,7 +1358,8 @@ void ldlm_resource_dump(int level, struct ldlm_resource *res) LDLM_DEBUG_LIMIT(level, lock, "###"); if (!(level & D_CANTMASK) && ++granted > ldlm_dump_granted_max) { - CDEBUG(level, "only dump %d granted locks to avoid DDOS.\n", + CDEBUG(level, + "only dump %d granted locks to avoid DDOS.\n", granted); break; } -- 2.7.4 ^ permalink raw reply related [flat|nested] 21+ messages in thread
end of thread, other threads:[~2017-09-15 7:58 UTC | newest] Thread overview: 21+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2017-09-15 5:55 [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Aastha Gupta 2017-09-15 5:55 ` [PATCH 1/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 2/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 3/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 4/8] staging: lustre: ldlm: fix lines " Aastha Gupta 2017-09-15 5:55 ` [PATCH 5/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 6/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 7/8] " Aastha Gupta 2017-09-15 5:55 ` [PATCH 8/8] " Aastha Gupta 2017-09-15 6:16 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line " Julia Lawall 2017-09-15 6:38 ` [PATCH v2 " Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 1/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_extent Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 2/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_flock Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 3/8] staging: lustre: ldlm: fix line over 80 characters in ldlm_internal Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 4/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lock Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 5/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_lockd Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 6/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_pool Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 7/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_request Aastha Gupta 2017-09-15 6:38 ` [PATCH v2 8/8] staging: lustre: ldlm: fix lines over 80 characters in ldlm_resource Aastha Gupta 2017-09-15 7:29 ` [Outreachy kernel] [PATCH 0/8] staging: lustre: ldlm: fix line over 80 characters Dilger, Andreas 2017-09-15 7:57 ` [PATCH v3] staging: lustre: ldlm: fix lines over 80 characters in ldlm files Aastha Gupta
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.