From: Srikrishan Malik <srikrishanmalik@gmail.com>
To: greg@kroah.com, andreas.dilger@intel.com, oleg.drokin@intel.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Srikrishan Malik <srikrishanmalik@gmail.com>
Subject: [PATCH 08/12] staging: lustre: fix multi line strings
Date: Wed, 6 Aug 2014 22:42:58 +0530 [thread overview]
Message-ID: <1407345182-709-8-git-send-email-srikrishanmalik@gmail.com> (raw)
In-Reply-To: <1407345182-709-1-git-send-email-srikrishanmalik@gmail.com>
Fixes the following checkpatch warning:
WARNING: quoted string split across lines
Signed-off-by: Srikrishan Malik <srikrishanmalik@gmail.com>
---
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 9 +++----
drivers/staging/lustre/lustre/mdc/mdc_reint.c | 3 +--
drivers/staging/lustre/lustre/mdc/mdc_request.c | 36 ++++++++++++-------------
3 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index 4d837d61be65..7f724e3c3f06 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -136,11 +136,10 @@ int mdc_set_lock_data(struct obd_export *exp, __u64 *lockh, void *data,
struct inode *old_inode = lock->l_resource->lr_lvb_inode;
LASSERTF(old_inode->i_state & I_FREEING,
- "Found existing inode %p/%lu/%u state %lu in lock: "
- "setting data to %p/%lu/%u\n", old_inode,
- old_inode->i_ino, old_inode->i_generation,
- old_inode->i_state,
- new_inode, new_inode->i_ino, new_inode->i_generation);
+ "Found existing inode %p/%lu/%u state %lu in lock: setting data to %p/%lu/%u\n",
+ old_inode, old_inode->i_ino, old_inode->i_generation,
+ old_inode->i_state, new_inode, new_inode->i_ino,
+ new_inode->i_generation);
}
lock->l_resource->lr_lvb_inode = new_inode;
if (bits)
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index c40304bf0b62..6f78bffa9294 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -158,8 +158,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
*mod = obd_mod_alloc();
if (*mod == NULL) {
- DEBUG_REQ(D_ERROR, req, "Can't allocate "
- "md_open_data");
+ DEBUG_REQ(D_ERROR, req, "Can't allocate md_open_data");
} else {
req->rq_replay = 1;
req->rq_cb_data = *mod;
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 57d903156917..6c691a4763b5 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -517,14 +517,14 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
struct lov_mds_md *lmm;
if (!S_ISREG(md->body->mode)) {
- CDEBUG(D_INFO, "OBD_MD_FLEASIZE set, should be a "
- "regular file, but is not\n");
+ CDEBUG(D_INFO,
+ "OBD_MD_FLEASIZE set, should be a regular file, but is not\n");
GOTO(out, rc = -EPROTO);
}
if (md->body->eadatasize == 0) {
- CDEBUG(D_INFO, "OBD_MD_FLEASIZE set, "
- "but eadatasize 0\n");
+ CDEBUG(D_INFO,
+ "OBD_MD_FLEASIZE set, but eadatasize 0\n");
GOTO(out, rc = -EPROTO);
}
lmmsize = md->body->eadatasize;
@@ -537,8 +537,8 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
GOTO(out, rc);
if (rc < sizeof(*md->lsm)) {
- CDEBUG(D_INFO, "lsm size too small: "
- "rc < sizeof (*md->lsm) (%d < %d)\n",
+ CDEBUG(D_INFO,
+ "lsm size too small: rc < sizeof (*md->lsm) (%d < %d)\n",
rc, (int)sizeof(*md->lsm));
GOTO(out, rc = -EPROTO);
}
@@ -548,14 +548,14 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
struct lov_mds_md *lmv;
if (!S_ISDIR(md->body->mode)) {
- CDEBUG(D_INFO, "OBD_MD_FLDIREA set, should be a "
- "directory, but is not\n");
+ CDEBUG(D_INFO,
+ "OBD_MD_FLDIREA set, should be a directory, but is not\n");
GOTO(out, rc = -EPROTO);
}
if (md->body->eadatasize == 0) {
- CDEBUG(D_INFO, "OBD_MD_FLDIREA is set, "
- "but eadatasize 0\n");
+ CDEBUG(D_INFO,
+ "OBD_MD_FLDIREA is set, but eadatasize 0\n");
return -EPROTO;
}
if (md->body->valid & OBD_MD_MEA) {
@@ -571,8 +571,8 @@ int mdc_get_lustre_md(struct obd_export *exp, struct ptlrpc_request *req,
GOTO(out, rc);
if (rc < sizeof(*md->mea)) {
- CDEBUG(D_INFO, "size too small: "
- "rc < sizeof(*md->mea) (%d < %d)\n",
+ CDEBUG(D_INFO,
+ "size too small: rc < sizeof(*md->mea) (%d < %d)\n",
rc, (int)sizeof(*md->mea));
GOTO(out, rc = -EPROTO);
}
@@ -778,8 +778,8 @@ int mdc_set_open_replay_data(struct obd_export *exp,
rec->cr_old_handle.cookie = body->handle.cookie;
open_req->rq_replay_cb = mdc_replay_open;
if (!fid_is_sane(&body->fid1)) {
- DEBUG_REQ(D_ERROR, open_req, "Saving replay request with "
- "insane fid");
+ DEBUG_REQ(D_ERROR, open_req,
+ "Saving replay request with insane fid");
LBUG();
}
@@ -928,8 +928,8 @@ int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
rc = lustre_msg_get_status(req->rq_repmsg);
if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) {
- DEBUG_REQ(D_ERROR, req, "type == PTL_RPC_MSG_ERR, err "
- "= %d", rc);
+ DEBUG_REQ(D_ERROR, req,
+ "type == PTL_RPC_MSG_ERR, err = %d", rc);
if (rc > 0)
rc = -rc;
}
@@ -2055,8 +2055,8 @@ static int mdc_hsm_copytool_send(int len, void *val)
return -EPROTO;
}
- CDEBUG(D_HSM, " Received message mg=%x t=%d m=%d l=%d actions=%d "
- "on %s\n",
+ CDEBUG(D_HSM,
+ " Received message mg=%x t=%d m=%d l=%d actions=%d on %s\n",
lh->kuc_magic, lh->kuc_transport, lh->kuc_msgtype,
lh->kuc_msglen, hal->hal_count, hal->hal_fsname);
--
1.9.3
next prev parent reply other threads:[~2014-08-06 17:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-06 17:12 [PATCH 01/12] staging: lustre: remove space between function name and and open parenthesis Srikrishan Malik
2014-08-06 17:12 ` [PATCH 02/12] staging: lustre: remove spaces from start of line Srikrishan Malik
2014-08-06 17:12 ` [PATCH 03/12] staging: lustre: move open brace to next line after functions Srikrishan Malik
2014-08-06 17:12 ` [PATCH 04/12] staging: lustre: fix lines over 80 chars Srikrishan Malik
2014-08-06 17:12 ` [PATCH 05/12] staging: lustre: Add missing spaces around operators and braces Srikrishan Malik
2014-08-06 20:13 ` Dan Carpenter
2014-08-06 20:31 ` Joe Perches
2014-08-06 20:45 ` Dan Carpenter
2014-08-06 21:26 ` Joe Perches
2014-08-06 17:12 ` [PATCH 06/12] staging: lustre: replace c99 style comments with C89 Srikrishan Malik
2014-08-06 20:15 ` Dan Carpenter
2014-08-06 17:12 ` [PATCH 07/12] staging: lustre: add blank lines after declarations Srikrishan Malik
2014-08-06 17:12 ` Srikrishan Malik [this message]
2014-08-06 17:12 ` [PATCH 09/12] staging: lustre: Added space between type name and * Srikrishan Malik
2014-08-06 17:13 ` [PATCH 10/12] staging: lustre: Fix misplaced opening brace warnings Srikrishan Malik
2014-08-06 20:18 ` Dan Carpenter
2014-08-07 15:31 ` Srikrishan Malik
2014-08-07 16:01 ` Dan Carpenter
2014-08-07 16:35 ` Joe Perches
2014-08-11 10:57 ` Srikrishan Malik
2014-08-11 11:36 ` Joe Perches
2014-08-11 14:21 ` Julia Lawall
2014-08-11 12:54 ` Dan Carpenter
2014-08-06 17:13 ` [PATCH 11/12] staging: lustre: move else on the same line as closing brace Srikrishan Malik
2014-08-06 17:13 ` [PATCH 12/12] staging: lustre: remove parentheses usage with return Srikrishan Malik
2014-08-10 4:32 ` [PATCH 01/12] staging: lustre: remove space between function name and and open parenthesis Greg KH
2014-08-10 14:43 ` Srikrishan Malik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407345182-709-8-git-send-email-srikrishanmalik@gmail.com \
--to=srikrishanmalik@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=devel@driverdev.osuosl.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox