[PATCH 06/11] staging: lustre: add missing spaces for LNet layer reported by checkpatch.pl

[James Simmons]

Add missing spaces in the code reported by checkpatch.pl.

Signed-off-by: James Simmons 
---
 .../staging/lustre/include/linux/lnet/lib-types.h  |2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c|2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h|4 ++--
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |2 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c|   12 ++--
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |6 +++---
 .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |2 +-
 drivers/staging/lustre/lnet/lnet/api-ni.c  |2 +-
 drivers/staging/lustre/lnet/lnet/config.c  |   15 +++
 drivers/staging/lustre/lnet/lnet/lib-eq.c  |1 -
 drivers/staging/lustre/lnet/lnet/lib-socket.c  |4 ++--
 drivers/staging/lustre/lnet/lnet/nidstrings.c  |2 +-
 12 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h 
b/drivers/staging/lustre/include/linux/lnet/lib-types.h
index 55d9d43..42f08c8 100644
--- a/drivers/staging/lustre/include/linux/lnet/lib-types.h
+++ b/drivers/staging/lustre/include/linux/lnet/lib-types.h
@@ -112,7 +112,7 @@ typedef struct lnet_libhandle {
 } lnet_libhandle_t;
 
 #define lh_entry(ptr, type, member) \
-   ((type *)((char *)(ptr)-(char *)(&((type *)0)->member)))
+   ((type *)((char *)(ptr) - (char *)(&((type *)0)->member)))
 
 typedef struct lnet_eq {
struct list_head  eq_list;
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
index 09eaecd..812d9b5 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c
@@ -1400,7 +1400,7 @@ static int kiblnd_create_fmr_pool(kib_fmr_poolset_t *fps,
kib_dev_t *dev = fps->fps_net->ibn_dev;
kib_fmr_pool_t *fpo;
struct ib_fmr_pool_param param = {
-   .max_pages_per_fmr = LNET_MAX_PAYLOAD/PAGE_SIZE,
+   .max_pages_per_fmr = LNET_MAX_PAYLOAD / PAGE_SIZE,
.page_shift= PAGE_SHIFT,
.access= (IB_ACCESS_LOCAL_WRITE |
  IB_ACCESS_REMOTE_WRITE),
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
index dbbbf55..288f0d2 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
@@ -146,7 +146,7 @@ kiblnd_concurrent_sends_v1(void)
 #define IBLND_OOB_CAPABLE(v)   ((v) != IBLND_MSG_VERSION_1)
 #define IBLND_OOB_MSGS(v) (IBLND_OOB_CAPABLE(v) ? 2 : 0)
 
-#define IBLND_MSG_SIZE   (4<<10)/* max size of queued messages 
(inc hdr) */
+#define IBLND_MSG_SIZE (4 << 10)/* max size of queued messages 
(inc hdr) */
 #define IBLND_MAX_RDMA_FRAGSLNET_MAX_IOV  /* max # of fragments 
supported */
 #define IBLND_CFG_RDMA_FRAGS   (*kiblnd_tunables.kib_map_on_demand != 0 ? \
*kiblnd_tunables.kib_map_on_demand :  \
@@ -691,7 +691,7 @@ kiblnd_send_keepalive(kib_conn_t *conn)
 {
return (*kiblnd_tunables.kib_keepalive > 0) &&
cfs_time_after(jiffies, conn->ibc_last_send +
-  *kiblnd_tunables.kib_keepalive*HZ);
+  *kiblnd_tunables.kib_keepalive * HZ);
 }
 
 static inline int
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c 
b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index 6b5a0b3..46d1810 100644
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1217,7 +1217,7 @@ static int kiblnd_resolve_addr(struct rdma_cm_id *cmid,
}
 
/* look for a free privileged port */
-   for (port = PROT_SOCK-1; port > 0; port--) {
+   for (port = PROT_SOCK - 1; port > 0; port--) {
srcaddr->sin_port = htons(port);
rc = rdma_resolve_addr(cmid,
   (struct sockaddr *)srcaddr,
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c 
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
index c428684..4ab7f29 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c
@@ -357,7 +357,7 @@ ksocknal_associate_route_conn_locked(ksock_route_t *route, 
ksock_conn_t *conn)
iface->ksni_nroutes++;
}
 
-   route->ksnr_connected |= (1<ksnr_connected |= (1 << type);
route->ksnr_conn_count++;
 
/*
@@ -839,7 +839,7 @@ ksocknal_select_ips(ksock_peer_t *peer, __u32 *peerips, int 
n_peerips)
best_iface->ksni_npeers++;
ip = best_iface->ksni_ipaddr;
 

Re: [PATCH 06/11] staging: lustre: add missing spaces for LNet layer reported by checkpatch.pl

[Joe Perches]

On Fri, 2016-02-12 at 12:06 -0500, James Simmons wrote:
> Add missing spaces in the code reported by checkpatch.pl.
[]
> diff --git a/drivers/staging/lustre/include/linux/lnet/lib-types.h 
> b/drivers/staging/lustre/include/linux/lnet/lib-types.h
[]
> @@ -112,7 +112,7 @@ typedef struct lnet_libhandle {
>  } lnet_libhandle_t;
>  
>  #define lh_entry(ptr, type, member) \
> - ((type *)((char *)(ptr)-(char *)(&((type *)0)->member)))
> + ((type *)((char *)(ptr) - (char *)(&((type *)0)->member)))

This could use offsetof(type, member)

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