summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRashika Kheria <rashika.kheria@gmail.com>2013-10-26 16:19:42 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-26 20:40:48 -0700
commit490f4dbc31e751fb7f803ab50c2dad86b757284b (patch)
tree725ca8a35a00e92a621fc01edf4ab7b93ffbb2ef
parentad0a75b4b74ae7a676b0d5267d5997a20206d791 (diff)
downloadlinux-stable-490f4dbc31e751fb7f803ab50c2dad86b757284b.tar.gz
linux-stable-490f4dbc31e751fb7f803ab50c2dad86b757284b.tar.bz2
linux-stable-490f4dbc31e751fb7f803ab50c2dad86b757284b.zip
Staging: lustre: Fix code indentation for conditional statements
This patch fixes the following checkpatch.pl warning in lustre/ldlm/interval_tree.c- WARNING: suspect code indent for conditional statements Signed-off-by: Rashika Kheria <rashika.kheria@gmail.com> Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/lustre/lustre/ldlm/interval_tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/lustre/lustre/ldlm/interval_tree.c b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
index c65b13c800f9..ced33557a602 100644
--- a/drivers/staging/lustre/lustre/ldlm/interval_tree.c
+++ b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
@@ -428,7 +428,7 @@ static void interval_erase_color(struct interval_node *node,
if (node_is_black_or_0(tmp->in_right)) {
struct interval_node *o_left;
if ((o_left = tmp->in_left))
- o_left->in_color = INTERVAL_BLACK;
+ o_left->in_color = INTERVAL_BLACK;
tmp->in_color = INTERVAL_RED;
__rotate_right(tmp, root);
tmp = parent->in_right;
@@ -436,7 +436,7 @@ static void interval_erase_color(struct interval_node *node,
tmp->in_color = parent->in_color;
parent->in_color = INTERVAL_BLACK;
if (tmp->in_right)
- tmp->in_right->in_color = INTERVAL_BLACK;
+ tmp->in_right->in_color = INTERVAL_BLACK;
__rotate_left(parent, root);
node = *root;
break;
@@ -458,7 +458,7 @@ static void interval_erase_color(struct interval_node *node,
if (node_is_black_or_0(tmp->in_left)) {
struct interval_node *o_right;
if ((o_right = tmp->in_right))
- o_right->in_color = INTERVAL_BLACK;
+ o_right->in_color = INTERVAL_BLACK;
tmp->in_color = INTERVAL_RED;
__rotate_left(tmp, root);
tmp = parent->in_left;
@@ -545,7 +545,7 @@ void interval_erase(struct interval_node *node,
update_maxhigh(child ? : parent, node->in_max_high);
update_maxhigh(node, old->in_max_high);
if (parent == old)
- parent = node;
+ parent = node;
goto color;
}
parent = node->in_parent;