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: Emoly Liu <emoly.liu@intel.com>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
index 38c507f..d6b61bc 100644 (file)
--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
@@ -255,14 +255,13 @@ reprocess:
                         * overflow and underflow.
                         */
                        if ((new->l_policy_data.l_flock.start >
-                            (lock->l_policy_data.l_flock.end + 1))
-                           && (lock->l_policy_data.l_flock.end !=
-                               OBD_OBJECT_EOF))
+                            (lock->l_policy_data.l_flock.end + 1)) &&
+                           (lock->l_policy_data.l_flock.end != OBD_OBJECT_EOF))
                                continue;
 
                        if ((new->l_policy_data.l_flock.end <
-                            (lock->l_policy_data.l_flock.start - 1))
-                           && (lock->l_policy_data.l_flock.start != 0))
+                            (lock->l_policy_data.l_flock.start - 1)) &&
+                           (lock->l_policy_data.l_flock.start != 0))
                                break;
 
                        if (new->l_policy_data.l_flock.start <

diff --git a/drivers/staging/lustre/lustre/obdclass/obd_config.c b/drivers/staging/lustre/lustre/obdclass/obd_config.c
index 694c58e..f1c41a1 100644 (file)
--- a/drivers/staging/lustre/lustre/obdclass/obd_config.c
+++ b/drivers/staging/lustre/lustre/obdclass/obd_config.c
@@ -1017,8 +1017,8 @@ int class_process_proc_param(char *prefix, struct lprocfs_vars *lvars,
                /* Search proc entries */
                while (lvars[j].name) {
                        var = &lvars[j];
-                       if (!class_match_param(key, var->name, NULL)
-                           && keylen == strlen(var->name)) {
+                       if (!class_match_param(key, var->name, NULL) &&
+                           keylen == strlen(var->name)) {
                                matched++;
                                rc = -EROFS;
                                if (var->fops && var->fops->write) {