[PATCH 0/5] staging: lustre: cl_page.c: Fix one file coding sytle issue.

[PATCH 0/5] staging: lustre: cl_page.c: Fix one file coding sytle issue.

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Fix one file coding sytle issues.
  Include 3 warnings and 2 errors of coding sytle of cl_page.c.

 drivers/staging/lustre/lustre/obdclass/cl_page.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

-- 
1.9.0

[PATCH 1/5] staging: lustre: Add blank line after variable definition.

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Add blank line after local variable definition to make it clear for reading.
Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>

---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index a7f3032..8b2c1e7 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -169,6 +169,7 @@ int cl_page_gang_lookup(const struct lu_env *env, struct cl_object *obj,
 	while ((nr = radix_tree_gang_lookup(&hdr->coh_tree, (void **)pvec,
 					    idx, CLT_PVEC_SIZE)) > 0) {
 		int end_of_region = 0;
+
 		idx = pvec[nr - 1]->cp_index + 1;
 		for (i = 0, j = 0; i < nr; ++i) {
 			page = pvec[i];
@@ -286,6 +287,7 @@ static struct cl_page *cl_page_alloc(const struct lu_env *env,
 			GFP_NOFS);
 	if (page != NULL) {
 		int result = 0;
+
 		atomic_set(&page->cp_ref, 1);
 		if (type == CPT_CACHEABLE) /* for radix tree */
 			atomic_inc(&page->cp_ref);
-- 
1.9.0

[PATCH 2/5] staging: lustre: Add one space after ',' in parameters list.

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Add one space after ',' in function call parameters list.
Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>

---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 8b2c1e7..739814e 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -1427,7 +1427,7 @@ void cl_page_clip(const struct lu_env *env, struct cl_page *pg,
 	CL_PAGE_HEADER(D_TRACE, env, pg, "%d %d\n", from, to);
 	CL_PAGE_INVOID(env, pg, CL_PAGE_OP(cpo_clip),
 		       (const struct lu_env *,
-			const struct cl_page_slice *,int, int),
+			const struct cl_page_slice *, int, int),
 		       from, to);
 }
 EXPORT_SYMBOL(cl_page_clip);
-- 
1.9.0

[PATCH 3/5] staging: lustre: Remove unnecessary braces {}

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Remove unnecessary braces {} in single line statement code block.
Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 739814e..c386c43 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -374,9 +374,8 @@ static struct cl_page *cl_page_find0(const struct lu_env *env,
 						       idx) == page));
 	}
 
-	if (page != NULL) {
+	if (page != NULL)
 		return page;
-	}
 
 	/* allocate and initialize cl_page */
 	page = cl_page_alloc(env, o, idx, vmpage, type);
-- 
1.9.0

[PATCH 4/5] staging: lustre: Replace spaces at the start of a line

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Replace the spaces at the start of a line within tab.
Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index c386c43..4cc17d3 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -52,12 +52,12 @@ static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
 			    int radix);
 
 # define PASSERT(env, page, expr)				       \
-  do {								    \
+	do {								    \
 	  if (unlikely(!(expr))) {				      \
 		  CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n");    \
 		  LASSERT(0);					   \
 	  }							     \
-  } while (0)
+	} while (0)
 
 # define PINVRNT(env, page, exp) \
 	((void)sizeof(env), (void)sizeof(page), (void)sizeof !!(exp))
-- 
1.9.0

[PATCH 5/5] staging: lustre: Adjust code indent for macro.

[Incarnation P. Lee]

From: "Pan Li" <incarnation.p.lee@outlook.com>

Adjust code indent for macro, within tabs at the start and space in front of '\' for indent.
Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>
---
 drivers/staging/lustre/lustre/obdclass/cl_page.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/lustre/lustre/obdclass/cl_page.c b/drivers/staging/lustre/lustre/obdclass/cl_page.c
index 4cc17d3..428c6b2 100644
--- a/drivers/staging/lustre/lustre/obdclass/cl_page.c
+++ b/drivers/staging/lustre/lustre/obdclass/cl_page.c
@@ -51,12 +51,12 @@
 static void cl_page_delete0(const struct lu_env *env, struct cl_page *pg,
 			    int radix);
 
-# define PASSERT(env, page, expr)				       \
-	do {								    \
-	  if (unlikely(!(expr))) {				      \
-		  CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n");    \
-		  LASSERT(0);					   \
-	  }							     \
+# define PASSERT(env, page, expr)					   \
+	do {								   \
+		if (unlikely(!(expr))) {				   \
+			CL_PAGE_DEBUG(D_ERROR, (env), (page), #expr "\n"); \
+			LASSERT(0);					   \
+		}							   \
 	} while (0)
 
 # define PINVRNT(env, page, exp) \
-- 
1.9.0

Re: [PATCH 2/5] staging: lustre: Add one space after ', ' in parameters list.

[Sudip Mukherjee]

On Sat, Jul 25, 2015 at 09:49:19AM +0800, Incarnation P. Lee wrote:
> From: "Pan Li" <incarnation.p.lee@outlook.com>
> 
> Add one space after ',' in function call parameters list.
> Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>
> 
> ---
This has already been done by 574150f0d275 ("staging:lustre: fix "space
required after that ', '" error in cl_page.c").

I think you need to refresh your tree.

regards
sudip

Re: [PATCH 1/5] staging: lustre: Add blank line after variable definition.

[Greg KH]

On Sat, Jul 25, 2015 at 09:49:00AM +0800, Incarnation P. Lee wrote:
> From: "Pan Li" <incarnation.p.lee@outlook.com>
> 
> Add blank line after local variable definition to make it clear for reading.
> Signed-off-by: Pan Li <incarnation.p.lee@outlook.com>

Please put a blank line before your signed-off-by line, otherwise the
tools don't pick it up properly.

Please fix up and resend the series.

thanks,

greg k-h