[PATCH 1/2] Staging: lustre: Fix line length exceeding 80 characters

2014-01-05 Thread MonamAgarwal
This patch fixes the following checkpatch.pl warning in
lustre/ldlm/interval_tree.c
WARNING: line over 80 characters in the file

Signed-off-by: MonamAgarwal 
---
 drivers/staging/lustre/lustre/ldlm/interval_tree.c |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ldlm/interval_tree.c 
b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
index 1de1d8e..f61bf19 100644
--- a/drivers/staging/lustre/lustre/ldlm/interval_tree.c
+++ b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
@@ -429,7 +429,8 @@ static void interval_erase_color(struct interval_node *node,
struct interval_node *o_left;
o_left = tmp->in_left;
if (o_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;
@@ -437,7 +438,8 @@ 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;
@@ -460,7 +462,8 @@ static void interval_erase_color(struct interval_node *node,
struct interval_node *o_right;
o_right = tmp->in_right;
if (o_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;
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


[PATCH 2/2] Staging: lustre: Fix return does not need parantheses

2014-01-05 Thread MonamAgarwal
This patch fixes the following checkpatch.pl warning in
lustre/ldlm/interval_tree.c
ERROR: return is not a function, parentheses are not required

Signed-off-by: MonamAgarwal 
---
 drivers/staging/lustre/lustre/ldlm/interval_tree.c |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/ldlm/interval_tree.c 
b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
index f61bf19..9338203 100644
--- a/drivers/staging/lustre/lustre/ldlm/interval_tree.c
+++ b/drivers/staging/lustre/lustre/ldlm/interval_tree.c
@@ -578,8 +578,8 @@ EXPORT_SYMBOL(interval_erase);
 static inline int interval_may_overlap(struct interval_node *node,
  struct interval_node_extent *ext)
 {
-   return (ext->start <= node->in_max_high &&
-   ext->end >= interval_low(node));
+   return ext->start <= node->in_max_high &&
+   ext->end >= interval_low(node);
 }

 /*
--
1.7.9.5

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel