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 04/12] staging: lustre: fix lines over 80 chars
Date: Wed, 6 Aug 2014 22:42:54 +0530 [thread overview]
Message-ID: <1407345182-709-4-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: line over 80 characters
Signed-off-by: Srikrishan Malik <srikrishanmalik@gmail.com>
---
drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 ++++--
drivers/staging/lustre/lustre/mdc/mdc_lib.c | 9 ++++++---
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 7 ++++---
drivers/staging/lustre/lustre/mdc/mdc_request.c | 6 ++++--
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
index f883d9c28f20..16341c818358 100644
--- a/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
+++ b/drivers/staging/lustre/lustre/mdc/lproc_mdc.c
@@ -56,7 +56,8 @@ static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file,
size_t count,
loff_t *off)
{
- struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
+ struct obd_device *dev =
+ ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
int val, rc;
@@ -84,7 +85,8 @@ static int mdc_kuc_open(struct inode *inode, struct file *file)
static ssize_t mdc_kuc_write(struct file *file, const char *buffer,
size_t count, loff_t *off)
{
- struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ struct obd_device *obd =
+ ((struct seq_file *)file->private_data)->private;
struct kuc_hdr *lh;
struct hsm_action_list *hal;
struct hsm_action_item *hai;
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_lib.c b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
index daaa7422c03f..16e2e0b611d1 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_lib.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_lib.c
@@ -52,7 +52,8 @@ static void __mdc_pack_body(struct mdt_body *b, __u32 suppgid)
b->capability = cfs_curproc_cap_pack();
}
-void mdc_pack_capa(struct ptlrpc_request *req, const struct req_msg_field *field,
+void mdc_pack_capa(struct ptlrpc_request *req,
+ const struct req_msg_field *field,
struct obd_capa *oc)
{
struct req_capsule *pill = &req->rq_pill;
@@ -317,7 +318,8 @@ static void mdc_setattr_pack_rec(struct mdt_rec_setattr *rec,
rec->sa_atime = LTIME_S(op_data->op_attr.ia_atime);
rec->sa_mtime = LTIME_S(op_data->op_attr.ia_mtime);
rec->sa_ctime = LTIME_S(op_data->op_attr.ia_ctime);
- rec->sa_attr_flags = ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags;
+ rec->sa_attr_flags =
+ ((struct ll_iattr *)&op_data->op_attr)->ia_attr_flags;
if ((op_data->op_attr.ia_valid & ATTR_GID) &&
in_group_p(op_data->op_attr.ia_gid))
rec->sa_suppgid =
@@ -552,7 +554,8 @@ int mdc_enter_request(struct client_obd *cli)
list_add_tail(&mcw.mcw_entry, &cli->cl_cache_waiters);
init_waitqueue_head(&mcw.mcw_waitq);
client_obd_list_unlock(&cli->cl_loi_list_lock);
- rc = l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw), &lwi);
+ rc = l_wait_event(mcw.mcw_waitq, mdc_req_avail(cli, &mcw),
+ &lwi);
if (rc) {
client_obd_list_lock(&cli->cl_loi_list_lock);
if (list_empty(&mcw.mcw_entry))
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index 88b43823c632..5de9e8862393 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -450,8 +450,8 @@ static struct ptlrpc_request *mdc_intent_unlink_pack(struct obd_export *exp,
}
static struct ptlrpc_request *mdc_intent_getattr_pack(struct obd_export *exp,
- struct lookup_intent *it,
- struct md_op_data *op_data)
+ struct lookup_intent *it,
+ struct md_op_data *op_data)
{
struct ptlrpc_request *req;
struct obd_device *obddev = class_exp2obd(exp);
@@ -1039,7 +1039,8 @@ static int mdc_finish_intent_lock(struct obd_export *exp,
memcpy(&old_lock, lockh, sizeof(*lockh));
if (ldlm_lock_match(NULL, LDLM_FL_BLOCK_GRANTED, NULL,
- LDLM_IBITS, &policy, LCK_NL, &old_lock, 0)) {
+ LDLM_IBITS, &policy, LCK_NL,
+ &old_lock, 0)) {
ldlm_lock_decref_and_cancel(lockh,
it->d.lustre.it_lock_mode);
memcpy(lockh, &old_lock, sizeof(old_lock));
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 0bcf624620ce..5126262aa73d 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -897,7 +897,8 @@ int mdc_close(struct obd_export *exp, struct md_op_data *op_data,
mod->mod_open_req->rq_replay = 0;
spin_unlock(&mod->mod_open_req->rq_lock);
} else {
- CDEBUG(D_HA, "couldn't find open req; expecting close error\n");
+ CDEBUG(D_HA,
+ "couldn't find open req; expecting close error\n");
}
mdc_close_pack(req, op_data);
@@ -1084,7 +1085,8 @@ restart_bulk:
CERROR("too many resend retries, returning error\n");
return -EIO;
}
- lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(resends), NULL, NULL, NULL);
+ lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(resends),
+ NULL, NULL, NULL);
l_wait_event(waitq, 0, &lwi);
goto restart_bulk;
--
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 ` Srikrishan Malik [this message]
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 ` [PATCH 08/12] staging: lustre: fix multi line strings Srikrishan Malik
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-4-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