Commit d719d2dd authored by Emoly Liu's avatar Emoly Liu Committed by Greg Kroah-Hartman

staging/lustre: Keep logical continuations on the previous line

This patch fixes all checkpatch occurences of
"CHECK: Logical continuations should be on the previous line"
in Lustre code.
Signed-off-by: default avatarEmoly Liu <emoly.liu@intel.com>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1b91de8
...@@ -255,14 +255,13 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, ...@@ -255,14 +255,13 @@ static int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
* overflow and underflow. * overflow and underflow.
*/ */
if ((new->l_policy_data.l_flock.start > if ((new->l_policy_data.l_flock.start >
(lock->l_policy_data.l_flock.end + 1)) (lock->l_policy_data.l_flock.end + 1)) &&
&& (lock->l_policy_data.l_flock.end != (lock->l_policy_data.l_flock.end != OBD_OBJECT_EOF))
OBD_OBJECT_EOF))
continue; continue;
if ((new->l_policy_data.l_flock.end < if ((new->l_policy_data.l_flock.end <
(lock->l_policy_data.l_flock.start - 1)) (lock->l_policy_data.l_flock.start - 1)) &&
&& (lock->l_policy_data.l_flock.start != 0)) (lock->l_policy_data.l_flock.start != 0))
break; break;
if (new->l_policy_data.l_flock.start < if (new->l_policy_data.l_flock.start <
......
...@@ -1017,8 +1017,8 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars, ...@@ -1017,8 +1017,8 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
/* Search proc entries */ /* Search proc entries */
while (lvars[j].name) { while (lvars[j].name) {
var = &lvars[j]; var = &lvars[j];
if (!class_match_param(key, var->name, NULL) if (!class_match_param(key, var->name, NULL) &&
&& keylen == strlen(var->name)) { keylen == strlen(var->name)) {
matched++; matched++;
rc = -EROFS; rc = -EROFS;
if (var->fops && var->fops->write) { if (var->fops && var->fops->write) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment