From: Anil Belur <askb23@gmail.com>
To: andreas.dilger@intel.com, oleg.drokin@intel.com,
gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, hpdd-discuss@ml01.01.org,
Anil Belur <askb23@gmail.com>
Subject: [PATCH v3 7/7] staging: lustre: lclient: lcommon_cl.c fixing coding style issues
Date: Mon, 16 Jun 2014 14:28:36 +1000 [thread overview]
Message-ID: <1402892916-5298-7-git-send-email-askb23@gmail.com> (raw)
In-Reply-To: <1402892916-5298-1-git-send-email-askb23@gmail.com>
From: Anil Belur <askb23@gmail.com>
fixed: WARNING: line over 80 characters and indent after the conditional
statement
Signed-off-by: Anil Belur <askb23@gmail.com>
---
drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
index c180a20..8fed70c 100644
--- a/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
+++ b/drivers/staging/lustre/lustre/lclient/lcommon_cl.c
@@ -825,6 +825,7 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
loff_t pos = start + count - 1;
loff_t kms;
int result;
+ unsigned long cur_index;
/*
* Consistency guarantees: following possibilities exist for the
@@ -864,11 +865,13 @@ int ccc_prep_size(const struct lu_env *env, struct cl_object *obj,
* linux-2.6.18-128.1.1 miss to do that.
* --bug 17336 */
loff_t size = cl_isize_read(inode);
- unsigned long cur_index = start >> PAGE_CACHE_SHIFT;
+
+ cur_index = start >> PAGE_CACHE_SHIFT;
+ loff_t check = ((size - 1) >> PAGE_CACHE_SHIFT);
if ((size == 0 && cur_index != 0) ||
- (((size - 1) >> PAGE_CACHE_SHIFT) < cur_index))
- *exceed = 1;
+ (check < cur_index))
+ *exceed = 1;
}
return result;
} else {
--
1.9.0
next prev parent reply other threads:[~2014-06-16 4:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-16 4:28 [PATCH v3 1/7] staging: lustre: lclient: glimpse.c fixing coding style issues Anil Belur
2014-06-16 4:28 ` [PATCH v3 2/7] " Anil Belur
2014-06-16 4:28 ` [PATCH v3 3/7] staging: lustre: lclient: lcommon_misc.c " Anil Belur
2014-06-16 4:28 ` [PATCH v3 4/7] staging: lustre: lclient: lcommon_cl.c " Anil Belur
2014-06-16 4:28 ` [PATCH v3 5/7] " Anil Belur
2014-06-16 4:28 ` [PATCH v3 6/7] " Anil Belur
2014-06-16 4:28 ` Anil Belur [this message]
2014-06-16 5:05 ` [PATCH v3 7/7] " Drokin, Oleg
2014-06-16 6:01 ` Anil Shashikumar Belur
2014-06-16 4:55 ` [PATCH v3 1/7] staging: lustre: lclient: glimpse.c " Drokin, Oleg
2014-06-16 6:01 ` Anil Shashikumar Belur
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=1402892916-5298-7-git-send-email-askb23@gmail.com \
--to=askb23@gmail.com \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpdd-discuss@ml01.01.org \
--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