X-GM-THRID: 4945298325504 X-Google-Groups: outreachy-kernel X-Google-Thread: 9ca63f596c,c497780d2890c69d,start X-Google-Attributes: gid9ca63f596c,domainid0,private,googlegroup X-Google-NewGroupId: yes X-Received: by 10.180.91.76 with SMTP id cc12mr810951wib.7.1425077874742; Fri, 27 Feb 2015 14:57:54 -0800 (PST) X-BeenThere: outreachy-kernel@googlegroups.com Received: by 10.152.204.200 with SMTP id la8ls232509lac.90.gmail; Fri, 27 Feb 2015 14:57:54 -0800 (PST) X-Received: by 10.112.138.202 with SMTP id qs10mr2352979lbb.24.1425077874160; Fri, 27 Feb 2015 14:57:54 -0800 (PST) Return-Path: Received: from mail-we0-x231.google.com (mail-we0-x231.google.com. [2a00:1450:400c:c03::231]) by gmr-mx.google.com with ESMTPS id ew5si212667wid.1.2015.02.27.14.57.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2015 14:57:54 -0800 (PST) Received-SPF: pass (google.com: domain of hamohammed.sa@gmail.com designates 2a00:1450:400c:c03::231 as permitted sender) client-ip=2a00:1450:400c:c03::231; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of hamohammed.sa@gmail.com designates 2a00:1450:400c:c03::231 as permitted sender) smtp.mail=hamohammed.sa@gmail.com; dkim=pass header.i=@gmail.com; dmarc=pass (p=NONE dis=NONE) header.from=gmail.com Received: by mail-we0-x231.google.com with SMTP id w55so23091612wes.5 for ; Fri, 27 Feb 2015 14:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=fojvmvL1LaX4nYmqcW33PWnzPCpsfYjcF298wIy6bHU=; b=zdxzqv6CgNt4IVv0iueMV6aKIu6OpFS+UouhptRCunxbBvSp+CnKtnEmzUYWnvxVhH ej93u/JDJLNgWPUhwtPkP6dzA7zAEd5kcNnp7G69ak4EIBllAxCr/tnN7SGBS5+TvuwN GeBUVjUS3KQf1KoMh+QUKBnVQdU99ZtlDhXIbYA1bO2DgkUViXDsuEnVe3q++rp/X4Do GBshqmRp468xdTqU6VBOebcDaOJ7tEYyMirrJ2xaVcABZIftfN6OiFdHz9zkTs3NjueO G5ZzmNKWuT3ob/khCq33K0lyylUQUD974+kWQK2vCc91AtTzO5klW1F5BPoVMP9tIA9+ rFtQ== X-Received: by 10.181.12.5 with SMTP id em5mr11298085wid.84.1425077874049; Fri, 27 Feb 2015 14:57:54 -0800 (PST) Return-Path: Received: from haneensa-VirtualBox ([79.170.55.43]) by mx.google.com with ESMTPSA id v6sm4737044wix.8.2015.02.27.14.57.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 27 Feb 2015 14:57:53 -0800 (PST) Received: by haneensa-VirtualBox (Postfix, from userid 1000) id E2A0460CA0; Sat, 28 Feb 2015 01:57:49 +0300 (AST) From: Haneen Mohammed To: outreachy-kernel@googlegroups.com Cc: Haneen Mohammed Subject: [PATCH] Staging: lustre: lustre: ldlm: Fix line over 80 characters Date: Sat, 28 Feb 2015 01:57:48 +0300 Message-Id: <1425077868-27905-1-git-send-email-hamohammed.sa@gmail.com> X-Mailer: git-send-email 1.9.1 This patch splits line over 80 characters addressing checkpatch.pl warning. Signed-off-by: Haneen Mohammed --- 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