Re: [lustre-devel] [PATCH 07/10] staging: lustre: cleanup comment style for lnet selftest

2016-03-11 Thread Greg Kroah-Hartman
On Fri, Mar 11, 2016 at 10:25:32PM -0800, Greg Kroah-Hartman wrote:
> On Fri, Mar 11, 2016 at 10:24:00PM -0800, Greg Kroah-Hartman wrote:
> > On Sat, Mar 12, 2016 at 01:39:01AM +, Dilger, Andreas wrote:
> > > On 2016/03/11, 18:29, "lustre-devel on behalf of James Simmons"
> > >  > > jsimm...@infradead.org> wrote:
> > > 
> > > >Apply a consistent style for comments in the lnet selftest
> > > >code.
> > > >
> > > >Signed-off-by: James Simmons 
> > > >---
> > > > drivers/staging/lustre/lnet/selftest/brw_test.c  |8 ++--
> > > > drivers/staging/lustre/lnet/selftest/conctl.c|   50
> > > >+++---
> > > > drivers/staging/lustre/lnet/selftest/conrpc.c|   23 +-
> > > > drivers/staging/lustre/lnet/selftest/console.c   |   11 +++--
> > > > drivers/staging/lustre/lnet/selftest/framework.c |   20 
> > > > drivers/staging/lustre/lnet/selftest/ping_test.c |2 +-
> > > > drivers/staging/lustre/lnet/selftest/rpc.c   |   46
> > > >++--
> > > > drivers/staging/lustre/lnet/selftest/rpc.h   |2 +-
> > > > drivers/staging/lustre/lnet/selftest/selftest.h  |3 +-
> > > > drivers/staging/lustre/lnet/selftest/timer.c |6 +-
> > > > 10 files changed, 87 insertions(+), 84 deletions(-)
> > > >
> > > >diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c
> > > >b/drivers/staging/lustre/lnet/selftest/brw_test.c
> > > >index eebc924..6ac4d02 100644
> > > >--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
> > > >+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
> > > >@@ -86,7 +86,7 @@ brw_client_init(sfw_test_instance_t *tsi)
> > > > opc = breq->blk_opc;
> > > > flags = breq->blk_flags;
> > > > npg = breq->blk_npg;
> > > >-/*
> > > >+/**
> > > >  * NB: this is not going to work for variable page size,
> > > >  * but we have to keep it for compatibility
> > > >  */
> > > 
> > > The "/**" comment opener is only for header comment blocks that
> > > have markup in them.  I don't think that is kernel style for
> > > normal multi-line comments in the code.
> > 
> > Yes, that is correct.  James, can you fix this up and resend this
> > series?
> 
> Sorry, I meant the series from this patch onward.  I've applied the
> first 6.

Make that just this patch, the ones after this applied just fine.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [lustre-devel] [PATCH 07/10] staging: lustre: cleanup comment style for lnet selftest

2016-03-11 Thread Greg Kroah-Hartman
On Fri, Mar 11, 2016 at 10:24:00PM -0800, Greg Kroah-Hartman wrote:
> On Sat, Mar 12, 2016 at 01:39:01AM +, Dilger, Andreas wrote:
> > On 2016/03/11, 18:29, "lustre-devel on behalf of James Simmons"
> >  > jsimm...@infradead.org> wrote:
> > 
> > >Apply a consistent style for comments in the lnet selftest
> > >code.
> > >
> > >Signed-off-by: James Simmons 
> > >---
> > > drivers/staging/lustre/lnet/selftest/brw_test.c  |8 ++--
> > > drivers/staging/lustre/lnet/selftest/conctl.c|   50
> > >+++---
> > > drivers/staging/lustre/lnet/selftest/conrpc.c|   23 +-
> > > drivers/staging/lustre/lnet/selftest/console.c   |   11 +++--
> > > drivers/staging/lustre/lnet/selftest/framework.c |   20 
> > > drivers/staging/lustre/lnet/selftest/ping_test.c |2 +-
> > > drivers/staging/lustre/lnet/selftest/rpc.c   |   46
> > >++--
> > > drivers/staging/lustre/lnet/selftest/rpc.h   |2 +-
> > > drivers/staging/lustre/lnet/selftest/selftest.h  |3 +-
> > > drivers/staging/lustre/lnet/selftest/timer.c |6 +-
> > > 10 files changed, 87 insertions(+), 84 deletions(-)
> > >
> > >diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c
> > >b/drivers/staging/lustre/lnet/selftest/brw_test.c
> > >index eebc924..6ac4d02 100644
> > >--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
> > >+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
> > >@@ -86,7 +86,7 @@ brw_client_init(sfw_test_instance_t *tsi)
> > >   opc = breq->blk_opc;
> > >   flags = breq->blk_flags;
> > >   npg = breq->blk_npg;
> > >-  /*
> > >+  /**
> > >* NB: this is not going to work for variable page size,
> > >* but we have to keep it for compatibility
> > >*/
> > 
> > The "/**" comment opener is only for header comment blocks that
> > have markup in them.  I don't think that is kernel style for
> > normal multi-line comments in the code.
> 
> Yes, that is correct.  James, can you fix this up and resend this
> series?

Sorry, I meant the series from this patch onward.  I've applied the
first 6.
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel


Re: [lustre-devel] [PATCH 07/10] staging: lustre: cleanup comment style for lnet selftest

2016-03-11 Thread Dilger, Andreas
On 2016/03/11, 18:29, "lustre-devel on behalf of James Simmons"
 wrote:

>Apply a consistent style for comments in the lnet selftest
>code.
>
>Signed-off-by: James Simmons 
>---
> drivers/staging/lustre/lnet/selftest/brw_test.c  |8 ++--
> drivers/staging/lustre/lnet/selftest/conctl.c|   50
>+++---
> drivers/staging/lustre/lnet/selftest/conrpc.c|   23 +-
> drivers/staging/lustre/lnet/selftest/console.c   |   11 +++--
> drivers/staging/lustre/lnet/selftest/framework.c |   20 
> drivers/staging/lustre/lnet/selftest/ping_test.c |2 +-
> drivers/staging/lustre/lnet/selftest/rpc.c   |   46
>++--
> drivers/staging/lustre/lnet/selftest/rpc.h   |2 +-
> drivers/staging/lustre/lnet/selftest/selftest.h  |3 +-
> drivers/staging/lustre/lnet/selftest/timer.c |6 +-
> 10 files changed, 87 insertions(+), 84 deletions(-)
>
>diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c
>b/drivers/staging/lustre/lnet/selftest/brw_test.c
>index eebc924..6ac4d02 100644
>--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
>+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
>@@ -86,7 +86,7 @@ brw_client_init(sfw_test_instance_t *tsi)
>   opc = breq->blk_opc;
>   flags = breq->blk_flags;
>   npg = breq->blk_npg;
>-  /*
>+  /**
>* NB: this is not going to work for variable page size,
>* but we have to keep it for compatibility
>*/

The "/**" comment opener is only for header comment blocks that
have markup in them.  I don't think that is kernel style for
normal multi-line comments in the code.

Cheers, Andreas

>@@ -95,7 +95,7 @@ brw_client_init(sfw_test_instance_t *tsi)
>   } else {
>   test_bulk_req_v1_t *breq = >tsi_u.bulk_v1;
> 
>-  /*
>+  /**
>* I should never get this step if it's unknown feature
>* because make_session will reject unknown feature
>*/
>@@ -283,7 +283,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
>   } else {
>   test_bulk_req_v1_t *breq = >tsi_u.bulk_v1;
> 
>-  /*
>+  /**
>* I should never get this step if it's unknown feature
>* because make_session will reject unknown feature
>*/
>@@ -329,7 +329,7 @@ brw_client_done_rpc(sfw_test_unit_t *tsu,
>srpc_client_rpc_t *rpc)
>   if (rpc->crpc_status) {
>   CERROR("BRW RPC to %s failed with %d\n",
>  libcfs_id2str(rpc->crpc_dest), rpc->crpc_status);
>-  if (!tsi->tsi_stopping) /* rpc could have been aborted */
>+  if (!tsi->tsi_stopping) /* rpc could have been aborted */
>   atomic_inc(>sn_brw_errors);
>   return;
>   }
>diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c
>b/drivers/staging/lustre/lnet/selftest/conctl.c
>index 872df72..d045ac5 100644
>--- a/drivers/staging/lustre/lnet/selftest/conctl.c
>+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
>@@ -51,9 +51,9 @@ lst_session_new_ioctl(lstio_session_new_args_t *args)
>   char *name;
>   int rc;
> 
>-  if (!args->lstio_ses_idp || /* address for output sid */
>-  !args->lstio_ses_key ||/* no key is specified */
>-  !args->lstio_ses_namep || /* session name */
>+  if (!args->lstio_ses_idp || /* address for output sid */
>+  !args->lstio_ses_key || /* no key is specified */
>+  !args->lstio_ses_namep ||   /* session name */
>   args->lstio_ses_nmlen <= 0 ||
>   args->lstio_ses_nmlen > LST_NAME_SIZE)
>   return -EINVAL;
>@@ -95,11 +95,11 @@ lst_session_info_ioctl(lstio_session_info_args_t
>*args)
> {
>   /* no checking of key */
> 
>-  if (!args->lstio_ses_idp || /* address for output sid */
>-  !args->lstio_ses_keyp || /* address for output key */
>-  !args->lstio_ses_featp || /* address for output features */
>-  !args->lstio_ses_ndinfo || /* address for output ndinfo */
>-  !args->lstio_ses_namep || /* address for output name */
>+  if (!args->lstio_ses_idp || /* address for output sid */
>+  !args->lstio_ses_keyp ||/* address for output key */
>+  !args->lstio_ses_featp ||   /* address for output features */
>+  !args->lstio_ses_ndinfo ||  /* address for output ndinfo */
>+  !args->lstio_ses_namep ||   /* address for output name */
>   args->lstio_ses_nmlen <= 0 ||
>   args->lstio_ses_nmlen > LST_NAME_SIZE)
>   return -EINVAL;
>@@ -125,7 +125,7 @@ lst_debug_ioctl(lstio_debug_args_t *args)
>   if (!args->lstio_dbg_resultp)
>   return -EINVAL;
> 
>-  if (args->lstio_dbg_namep && /* name of batch/group */
>+  if 

[PATCH 07/10] staging: lustre: cleanup comment style for lnet selftest

2016-03-11 Thread James Simmons
Apply a consistent style for comments in the lnet selftest
code.

Signed-off-by: James Simmons 
---
 drivers/staging/lustre/lnet/selftest/brw_test.c  |8 ++--
 drivers/staging/lustre/lnet/selftest/conctl.c|   50 +++---
 drivers/staging/lustre/lnet/selftest/conrpc.c|   23 +-
 drivers/staging/lustre/lnet/selftest/console.c   |   11 +++--
 drivers/staging/lustre/lnet/selftest/framework.c |   20 
 drivers/staging/lustre/lnet/selftest/ping_test.c |2 +-
 drivers/staging/lustre/lnet/selftest/rpc.c   |   46 ++--
 drivers/staging/lustre/lnet/selftest/rpc.h   |2 +-
 drivers/staging/lustre/lnet/selftest/selftest.h  |3 +-
 drivers/staging/lustre/lnet/selftest/timer.c |6 +-
 10 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c 
b/drivers/staging/lustre/lnet/selftest/brw_test.c
index eebc924..6ac4d02 100644
--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
@@ -86,7 +86,7 @@ brw_client_init(sfw_test_instance_t *tsi)
opc = breq->blk_opc;
flags = breq->blk_flags;
npg = breq->blk_npg;
-   /*
+   /**
 * NB: this is not going to work for variable page size,
 * but we have to keep it for compatibility
 */
@@ -95,7 +95,7 @@ brw_client_init(sfw_test_instance_t *tsi)
} else {
test_bulk_req_v1_t *breq = >tsi_u.bulk_v1;
 
-   /*
+   /**
 * I should never get this step if it's unknown feature
 * because make_session will reject unknown feature
 */
@@ -283,7 +283,7 @@ brw_client_prep_rpc(sfw_test_unit_t *tsu,
} else {
test_bulk_req_v1_t *breq = >tsi_u.bulk_v1;
 
-   /*
+   /**
 * I should never get this step if it's unknown feature
 * because make_session will reject unknown feature
 */
@@ -329,7 +329,7 @@ brw_client_done_rpc(sfw_test_unit_t *tsu, srpc_client_rpc_t 
*rpc)
if (rpc->crpc_status) {
CERROR("BRW RPC to %s failed with %d\n",
   libcfs_id2str(rpc->crpc_dest), rpc->crpc_status);
-   if (!tsi->tsi_stopping) /* rpc could have been aborted */
+   if (!tsi->tsi_stopping) /* rpc could have been aborted */
atomic_inc(>sn_brw_errors);
return;
}
diff --git a/drivers/staging/lustre/lnet/selftest/conctl.c 
b/drivers/staging/lustre/lnet/selftest/conctl.c
index 872df72..d045ac5 100644
--- a/drivers/staging/lustre/lnet/selftest/conctl.c
+++ b/drivers/staging/lustre/lnet/selftest/conctl.c
@@ -51,9 +51,9 @@ lst_session_new_ioctl(lstio_session_new_args_t *args)
char *name;
int rc;
 
-   if (!args->lstio_ses_idp || /* address for output sid */
-   !args->lstio_ses_key ||/* no key is specified */
-   !args->lstio_ses_namep || /* session name */
+   if (!args->lstio_ses_idp || /* address for output sid */
+   !args->lstio_ses_key || /* no key is specified */
+   !args->lstio_ses_namep ||   /* session name */
args->lstio_ses_nmlen <= 0 ||
args->lstio_ses_nmlen > LST_NAME_SIZE)
return -EINVAL;
@@ -95,11 +95,11 @@ lst_session_info_ioctl(lstio_session_info_args_t *args)
 {
/* no checking of key */
 
-   if (!args->lstio_ses_idp || /* address for output sid */
-   !args->lstio_ses_keyp || /* address for output key */
-   !args->lstio_ses_featp || /* address for output features */
-   !args->lstio_ses_ndinfo || /* address for output ndinfo */
-   !args->lstio_ses_namep || /* address for output name */
+   if (!args->lstio_ses_idp || /* address for output sid */
+   !args->lstio_ses_keyp ||/* address for output key */
+   !args->lstio_ses_featp ||   /* address for output features */
+   !args->lstio_ses_ndinfo ||  /* address for output ndinfo */
+   !args->lstio_ses_namep ||   /* address for output name */
args->lstio_ses_nmlen <= 0 ||
args->lstio_ses_nmlen > LST_NAME_SIZE)
return -EINVAL;
@@ -125,7 +125,7 @@ lst_debug_ioctl(lstio_debug_args_t *args)
if (!args->lstio_dbg_resultp)
return -EINVAL;
 
-   if (args->lstio_dbg_namep && /* name of batch/group */
+   if (args->lstio_dbg_namep &&/* name of batch/group */
(args->lstio_dbg_nmlen <= 0 ||
 args->lstio_dbg_nmlen > LST_NAME_SIZE))
return -EINVAL;
@@ -327,7 +327,7 @@ lst_nodes_add_ioctl(lstio_group_nodes_args_t *args)
if (args->lstio_grp_key != console_session.ses_key)
return -EACCES;
 
-   if (!args->lstio_grp_idsp ||