Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Greg Kroah-Hartman 
On Thu, Sep 03, 2015 at 08:22:55AM +0300, Mike Rapoport wrote:
> On Wed, Sep 02, 2015 at 05:48:46PM -0700, Greg Kroah-Hartman wrote:
> > On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> > > Added/removed spaces and replaced '+1' with '1' in several places to
> > > eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> > > 
> > > Signed-off-by: Mike Rapoport 
> > 
> > Does not apply to my tree :(
> 
> Rebased against current staging-testing.
> 
> 
> >From 4f4cdc89b94aec9a72cec4cec171d049f6f65a2a Mon Sep 17 00:00:00 2001
> From: Mike Rapoport 
> Date: Sat, 22 Aug 2015 17:17:19 +0300
> Subject: [PATCH] staging: lustre: fix whitespace errors reported by
>  checkpatch.pl

Please resend it in a form that doesn't require me to hand-edit it :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Mike Rapoport 
On Wed, Sep 02, 2015 at 05:48:46PM -0700, Greg Kroah-Hartman wrote:
> On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> > Added/removed spaces and replaced '+1' with '1' in several places to
> > eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> > 
> > Signed-off-by: Mike Rapoport 
> 
> Does not apply to my tree :(

Rebased against current staging-testing.


>From 4f4cdc89b94aec9a72cec4cec171d049f6f65a2a Mon Sep 17 00:00:00 2001
From: Mike Rapoport 
Date: Sat, 22 Aug 2015 17:17:19 +0300
Subject: [PATCH] staging: lustre: fix whitespace errors reported by
 checkpatch.pl

Added/removed spaces and replaced '+1' with '1' in several places to
eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl

Signed-off-by: Mike Rapoport 
---
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   4 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h  |   4 +-
 drivers/staging/lustre/lnet/selftest/console.c |  16 +--
 drivers/staging/lustre/lnet/selftest/selftest.h|   2 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |  14 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |  16 +--
 .../lustre/lustre/include/lustre/lustre_idl.h  |  12 +-
 .../lustre/lustre/include/lustre/lustre_user.h |   4 +-
 .../staging/lustre/lustre/include/lustre_capa.h|   2 +-
 .../staging/lustre/lustre/include/lustre_disk.h|   2 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |   6 +-
 .../lustre/lustre/include/lustre_dlm_flags.h   | 152 ++---
 drivers/staging/lustre/lustre/include/lustre_lib.h |   6 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |   2 +-
 drivers/staging/lustre/lustre/include/obd.h|   2 +-
 .../staging/lustre/lustre/include/obd_support.h|   2 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |   4 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   2 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   2 +-
 drivers/staging/lustre/lustre/llite/rw.c   |   6 +-
 drivers/staging/lustre/lustre/llite/statahead.c|   4 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c   |   2 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c|   2 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c|   4 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c |  10 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |   6 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   2 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |   4 +-
 drivers/staging/lustre/lustre/obdclass/genops.c|   6 +-
 drivers/staging/lustre/lustre/obdclass/llog.c  |   4 +-
 .../staging/lustre/lustre/obdclass/obd_config.c|   2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c|   6 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c|   2 +-
 33 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index ffdc06c..d0c79d1 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -714,7 +714,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t 
*conn)
LASSERT(tx->tx_resid == tx->tx_nob);
 
CDEBUG (D_NET, "Packet %p type %d, nob %d niov %d nkiov %d\n",
-   tx, (tx->tx_lnetmsg != NULL) ? tx->tx_lnetmsg->msg_hdr.type:
+   tx, (tx->tx_lnetmsg != NULL) ? tx->tx_lnetmsg->msg_hdr.type :
   KSOCK_MSG_NOOP,
tx->tx_nob, tx->tx_niov, tx->tx_nkiov);
 
@@ -1092,7 +1092,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
conn->ksnc_rx_iov[niov].iov_len  = nob;
niov++;
skipped += nob;
-   nob_to_skip -=nob;
+   nob_to_skip -= nob;
 
} while (nob_to_skip != 0 &&/* mustn't overflow conn's rx iov */
 niov < sizeof(conn->ksnc_rx_iov_space) / sizeof (struct 
iovec));
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h 
b/drivers/staging/lustre/lnet/selftest/conrpc.h
index 7d33cf9..ae7ed75 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -105,8 +105,8 @@ typedef struct lstcon_rpc_trans {
 
 #define LST_TRANS_STATQRY   0x21
 
-typedef int (* lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
-typedef int (* lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t 
*);
+typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
+typedef int (*lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t 
*);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
unsigned version, lstcon_rpc_t **crpc);
diff --git a/drivers/staging/lustre/lnet/selftest/console.c 
b/drivers/staging/lustre/lnet/selftest/console.c
index f47c8f2..5c624e1 100644
---

Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Greg Kroah-Hartman 
On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> Added/removed spaces and replaced '+1' with '1' in several places to
> eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> 
> Signed-off-by: Mike Rapoport 

Does not apply to my tree :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Greg Kroah-Hartman 
On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> Added/removed spaces and replaced '+1' with '1' in several places to
> eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> 
> Signed-off-by: Mike Rapoport 

Does not apply to my tree :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Greg Kroah-Hartman 
On Thu, Sep 03, 2015 at 08:22:55AM +0300, Mike Rapoport wrote:
> On Wed, Sep 02, 2015 at 05:48:46PM -0700, Greg Kroah-Hartman wrote:
> > On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> > > Added/removed spaces and replaced '+1' with '1' in several places to
> > > eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> > > 
> > > Signed-off-by: Mike Rapoport 
> > 
> > Does not apply to my tree :(
> 
> Rebased against current staging-testing.
> 
> 
> >From 4f4cdc89b94aec9a72cec4cec171d049f6f65a2a Mon Sep 17 00:00:00 2001
> From: Mike Rapoport 
> Date: Sat, 22 Aug 2015 17:17:19 +0300
> Subject: [PATCH] staging: lustre: fix whitespace errors reported by
>  checkpatch.pl

Please resend it in a form that doesn't require me to hand-edit it :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/5] staging: lustre: fix whitespace errors reported by checkpatch.pl

2015-09-02 Thread Mike Rapoport 
On Wed, Sep 02, 2015 at 05:48:46PM -0700, Greg Kroah-Hartman wrote:
> On Sat, Aug 22, 2015 at 05:17:19PM +0300, Mike Rapoport wrote:
> > Added/removed spaces and replaced '+1' with '1' in several places to
> > eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl
> > 
> > Signed-off-by: Mike Rapoport 
> 
> Does not apply to my tree :(

Rebased against current staging-testing.


>From 4f4cdc89b94aec9a72cec4cec171d049f6f65a2a Mon Sep 17 00:00:00 2001
From: Mike Rapoport 
Date: Sat, 22 Aug 2015 17:17:19 +0300
Subject: [PATCH] staging: lustre: fix whitespace errors reported by
 checkpatch.pl

Added/removed spaces and replaced '+1' with '1' in several places to
eliminate SPACING and POINTER_LOCATION errors reported by checkpatch.pl

Signed-off-by: Mike Rapoport 
---
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   4 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h  |   4 +-
 drivers/staging/lustre/lnet/selftest/console.c |  16 +--
 drivers/staging/lustre/lnet/selftest/selftest.h|   2 +-
 drivers/staging/lustre/lustre/include/cl_object.h  |  14 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |  16 +--
 .../lustre/lustre/include/lustre/lustre_idl.h  |  12 +-
 .../lustre/lustre/include/lustre/lustre_user.h |   4 +-
 .../staging/lustre/lustre/include/lustre_capa.h|   2 +-
 .../staging/lustre/lustre/include/lustre_disk.h|   2 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |   6 +-
 .../lustre/lustre/include/lustre_dlm_flags.h   | 152 ++---
 drivers/staging/lustre/lustre/include/lustre_lib.h |   6 +-
 drivers/staging/lustre/lustre/include/lustre_net.h |   2 +-
 drivers/staging/lustre/lustre/include/obd.h|   2 +-
 .../staging/lustre/lustre/include/obd_support.h|   2 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |   4 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   2 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   2 +-
 drivers/staging/lustre/lustre/llite/rw.c   |   6 +-
 drivers/staging/lustre/lustre/llite/statahead.c|   4 +-
 drivers/staging/lustre/lustre/llite/vvp_io.c   |   2 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c|   2 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c|   4 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c |  10 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |   6 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   2 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |   4 +-
 drivers/staging/lustre/lustre/obdclass/genops.c|   6 +-
 drivers/staging/lustre/lustre/obdclass/llog.c  |   4 +-
 .../staging/lustre/lustre/obdclass/obd_config.c|   2 +-
 drivers/staging/lustre/lustre/osc/osc_request.c|   6 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c|   2 +-
 33 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
index ffdc06c..d0c79d1 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c
@@ -714,7 +714,7 @@ ksocknal_queue_tx_locked (ksock_tx_t *tx, ksock_conn_t 
*conn)
LASSERT(tx->tx_resid == tx->tx_nob);
 
CDEBUG (D_NET, "Packet %p type %d, nob %d niov %d nkiov %d\n",
-   tx, (tx->tx_lnetmsg != NULL) ? tx->tx_lnetmsg->msg_hdr.type:
+   tx, (tx->tx_lnetmsg != NULL) ? tx->tx_lnetmsg->msg_hdr.type :
   KSOCK_MSG_NOOP,
tx->tx_nob, tx->tx_niov, tx->tx_nkiov);
 
@@ -1092,7 +1092,7 @@ ksocknal_new_packet (ksock_conn_t *conn, int nob_to_skip)
conn->ksnc_rx_iov[niov].iov_len  = nob;
niov++;
skipped += nob;
-   nob_to_skip -=nob;
+   nob_to_skip -= nob;
 
} while (nob_to_skip != 0 &&/* mustn't overflow conn's rx iov */
 niov < sizeof(conn->ksnc_rx_iov_space) / sizeof (struct 
iovec));
diff --git a/drivers/staging/lustre/lnet/selftest/conrpc.h 
b/drivers/staging/lustre/lnet/selftest/conrpc.h
index 7d33cf9..ae7ed75 100644
--- a/drivers/staging/lustre/lnet/selftest/conrpc.h
+++ b/drivers/staging/lustre/lnet/selftest/conrpc.h
@@ -105,8 +105,8 @@ typedef struct lstcon_rpc_trans {
 
 #define LST_TRANS_STATQRY   0x21
 
-typedef int (* lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
-typedef int (* lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t 
*);
+typedef int (*lstcon_rpc_cond_func_t)(int, struct lstcon_node *, void *);
+typedef int (*lstcon_rpc_readent_func_t)(int, srpc_msg_t *, lstcon_rpc_ent_t 
*);
 
 int  lstcon_sesrpc_prep(struct lstcon_node *nd, int transop,
unsigned version, lstcon_rpc_t **crpc);
diff --git a/drivers/staging/lustre/lnet/selftest/console.c