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 v2 10/13] staging: lustre: Fix misplaced opening brace warnings
Date: Mon, 11 Aug 2014 23:57:36 +0530 [thread overview]
Message-ID: <1407781659-728-10-git-send-email-srikrishanmalik@gmail.com> (raw)
In-Reply-To: <1407781659-728-1-git-send-email-srikrishanmalik@gmail.com>
Fixes the following checkpatch error:
ERROR: that open brace { should be on the previous line
Signed-off-by: Srikrishan Malik <srikrishanmalik@gmail.com>
---
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 18 +++++++++++-------
drivers/staging/lustre/lustre/mdc/mdc_reint.c | 3 +--
drivers/staging/lustre/lustre/mdc/mdc_request.c | 7 +++++--
3 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_locks.c b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
index c03d77c9c5b8..288ce9119ed5 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_locks.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_locks.c
@@ -785,14 +785,18 @@ int mdc_enqueue(struct obd_export *exp, struct ldlm_enqueue_info *einfo,
__u64 flags, saved_flags = extra_lock_flags;
int rc;
struct ldlm_res_id res_id;
- static const ldlm_policy_data_t lookup_policy =
- { .l_inodebits = { MDS_INODELOCK_LOOKUP } };
- static const ldlm_policy_data_t update_policy =
- { .l_inodebits = { MDS_INODELOCK_UPDATE } };
- static const ldlm_policy_data_t layout_policy =
- { .l_inodebits = { MDS_INODELOCK_LAYOUT } };
+ static const ldlm_policy_data_t lookup_policy = {
+ .l_inodebits = { MDS_INODELOCK_LOOKUP }
+ };
+ static const ldlm_policy_data_t update_policy = {
+ .l_inodebits = { MDS_INODELOCK_UPDATE }
+ };
+ static const ldlm_policy_data_t layout_policy = {
+ .l_inodebits = { MDS_INODELOCK_LAYOUT }
+ };
static const ldlm_policy_data_t getxattr_policy = {
- .l_inodebits = { MDS_INODELOCK_XATTR } };
+ .l_inodebits = { MDS_INODELOCK_XATTR }
+ };
ldlm_policy_data_t const *policy = &lookup_policy;
int generation, resends = 0;
struct ldlm_reply *lockrep;
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index 46800335ca7d..01af30ac1a52 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -152,8 +152,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data,
ptlrpc_request_set_replen(req);
if (mod && (op_data->op_flags & MF_EPOCH_OPEN) &&
- req->rq_import->imp_replayable)
- {
+ req->rq_import->imp_replayable) {
LASSERT(*mod == NULL);
*mod = obd_mod_alloc();
diff --git a/drivers/staging/lustre/lustre/mdc/mdc_request.c b/drivers/staging/lustre/lustre/mdc/mdc_request.c
index 6c691a4763b5..bf2dcf50afd4 100644
--- a/drivers/staging/lustre/lustre/mdc/mdc_request.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_request.c
@@ -1794,8 +1794,11 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len,
GOTO(out, rc);
case OBD_IOC_CHANGELOG_CLEAR: {
struct ioc_changelog *icc = karg;
- struct changelog_setinfo cs =
- {.cs_recno = icc->icc_recno, .cs_id = icc->icc_id};
+ struct changelog_setinfo cs = {
+ .cs_recno = icc->icc_recno,
+ .cs_id = icc->icc_id
+ };
+
rc = obd_set_info_async(NULL, exp, strlen(KEY_CHANGELOG_CLEAR),
KEY_CHANGELOG_CLEAR, sizeof(cs), &cs,
NULL);
--
1.9.3
next prev parent reply other threads:[~2014-08-11 18:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-11 18:27 [PATCH v2 01/13] staging: lustre: remove space between function name and and open parenthesis Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 02/13] staging: lustre: remove spaces from start of line Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 03/13] staging: lustre: move open brace to next line after functions Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 04/13] staging: lustre: fix lines over 80 chars Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 05/13] staging: lustre: Add missing spaces around operators and braces Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 06/13] staging: lustre: replace c99 style comments with C89 Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 07/13] staging: lustre: add blank lines after declarations Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 08/13] staging: lustre: fix multi line strings Srikrishan Malik
2014-08-12 2:17 ` Drokin, Oleg
2014-08-12 17:42 ` Srikrishan Malik
2014-08-13 14:01 ` [PATCH v3 08/13]] " Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 09/13] staging: lustre: Added space between type name and * Srikrishan Malik
2014-08-11 18:27 ` Srikrishan Malik [this message]
2014-08-11 18:27 ` [PATCH v2 11/13] staging: lustre: move else on the same line as closing brace Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 12/13] staging: lustre: remove parentheses usage with return Srikrishan Malik
2014-08-11 18:27 ` [PATCH v2 13/13] staging: lustre: Cleanup variable declarations in mdc_enqueue() 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=1407781659-728-10-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
all inboxes | Powered by JetHome®