[OPW,kernel,v2,1/7] Staging: lustre: Fix code indentation for conditional statements
diff mbox

Message ID 50993ba294437f2e916503998d21ff53b7a1d40a.1382784520.git.rashika.kheria@gmail.com
State Accepted
Headers show

Commit Message

Rashika Oct. 26, 2013, 10:49 a.m. UTC
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>
---

This revision fixes the following issues of the previous revision-
Incorrect file name

 drivers/staging/lustre/lustre/ldlm/interval_tree.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Waskiewicz Jr, Peter P Oct. 26, 2013, 8:23 p.m. UTC | #1
On Sat, 2013-10-26 at 16:19 +0530, Rashika Kheria wrote:
> 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>

Thanks for the quick turnaround on the small fixups.

Reviewed-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>

> ---
> 
> This revision fixes the following issues of the previous revision-
> Incorrect file name
> 
>  drivers/staging/lustre/lustre/ldlm/interval_tree.c |    8 ++++----
>  1 file 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 c65b13c..ced3355 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;
> -- 
> 1.7.9.5
>

Patch
diff mbox

diff --git a/drivers/staging/lustre/lustre/ldlm/interval_tree.c b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
index c65b13c..ced3355 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;