lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 6 Apr 2015 18:19:46 +0900
From:	Kai Katsumata <imperialroyalguard38@...il.com>
To:	Greg KH <gregkh@...uxfoundation.org>
Cc:	linux-kernel@...r.kernel.org
Subject: Re: [PATCH] staging: lustre: socklnd_prote: checkpatch.pl cleanups

2015-04-06 5:12 GMT+09:00 Greg KH <gregkh@...uxfoundation.org>:
> On Mon, Apr 06, 2015 at 03:56:39AM +0900, Raven wrote:
>> Fix coding style by checkpatch.pl.
>>
>> Signed-off-by: Kai Katsumata <imperialroyalguard38@...il.com>
>
> You sent a patch in html format, and your From: line didn't match the
> signed-off-by line, so I really can't take this, sorry.
>
> Please fix up and try again.
>
> thanks,
>
> greg k-h


I cannot determine which to send the it again patch or  to reply

Thanks, OK. fix email html format and signed-off-by line.

Fix coding style by checkpatch.pl.

Signed-off-by: Kai Katsumata <imperialroyalguard38@...il.com>
---
drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c | 83+++++----
1 file changed, 48 insertions(+), 35 deletions(-)

diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
index b2f88eb..f2cd180 100644
--- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
+++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd_proto.c
@@ -55,8 +55,8 @@ ksocknal_next_tx_carrier(ksock_conn_t *conn)
     ksock_tx_t     *tx = conn->ksnc_tx_carrier;

     /* Called holding BH lock: conn->ksnc_scheduler->kss_lock */
-    LASSERT (!list_empty(&conn->ksnc_tx_queue));
-    LASSERT (tx != NULL);
+    LASSERT(!list_empty(&conn->ksnc_tx_queue));
+    LASSERT(tx != NULL);

     /* Next TX that can carry ZC-ACK or LNet message */
     if (tx->tx_list.next == &conn->ksnc_tx_queue) {
@@ -65,7 +65,8 @@ ksocknal_next_tx_carrier(ksock_conn_t *conn)
     } else {
         conn->ksnc_tx_carrier = list_entry(tx->tx_list.next,
                                ksock_tx_t, tx_list);
-        LASSERT (conn->ksnc_tx_carrier->tx_msg.ksm_type ==
tx->tx_msg.ksm_type);
+        LASSERT(conn->ksnc_tx_carrier->tx_msg.ksm_type ==
+            tx->tx_msg.ksm_type);
     }
 }

@@ -75,7 +76,7 @@ ksocknal_queue_tx_zcack_v2(ksock_conn_t *conn,
 {
     ksock_tx_t *tx = conn->ksnc_tx_carrier;

-    LASSERT (tx_ack == NULL ||
+    LASSERT(tx_ack == NULL ||
          tx_ack->tx_msg.ksm_type == KSOCK_MSG_NOOP);

     /*
@@ -139,7 +140,7 @@ ksocknal_queue_tx_msg_v2(ksock_conn_t *conn,
ksock_tx_t *tx_msg)
         return NULL;
     }

-    LASSERT (tx->tx_msg.ksm_type == KSOCK_MSG_NOOP);
+    LASSERT(tx->tx_msg.ksm_type == KSOCK_MSG_NOOP);

     /* There is a noop zc-ack can be piggybacked */
     tx_msg->tx_msg.ksm_zc_cookies[1] = tx->tx_msg.ksm_zc_cookies[1];
@@ -162,7 +163,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
         return ksocknal_queue_tx_zcack_v2(conn, tx_ack, cookie);

     /* non-blocking ZC-ACK (to router) */
-    LASSERT (tx_ack == NULL ||
+    LASSERT(tx_ack == NULL ||
          tx_ack->tx_msg.ksm_type == KSOCK_MSG_NOOP);

     tx = conn->ksnc_tx_carrier;
@@ -185,7 +186,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,

     if (tx->tx_msg.ksm_zc_cookies[1] == SOCKNAL_KEEPALIVE_PING) {
         /* replace the keepalive PING with a real ACK */
-        LASSERT (tx->tx_msg.ksm_zc_cookies[0] == 0);
+        LASSERT(tx->tx_msg.ksm_zc_cookies[0] == 0);
         tx->tx_msg.ksm_zc_cookies[1] = cookie;
         return 1;
     }
@@ -198,16 +199,20 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
     }

     if (tx->tx_msg.ksm_zc_cookies[0] == 0) {
-        /* NOOP tx has only one ZC-ACK cookie, can carry at least one more */
+        /* NOOP tx has only one ZC-ACK cookie,
+           can carry at least one more */
         if (tx->tx_msg.ksm_zc_cookies[1] > cookie) {
-            tx->tx_msg.ksm_zc_cookies[0] = tx->tx_msg.ksm_zc_cookies[1];
+            tx->tx_msg.ksm_zc_cookies[0] =
+            tx->tx_msg.ksm_zc_cookies[1];
             tx->tx_msg.ksm_zc_cookies[1] = cookie;
         } else {
             tx->tx_msg.ksm_zc_cookies[0] = cookie;
         }

-        if (tx->tx_msg.ksm_zc_cookies[0] - tx->tx_msg.ksm_zc_cookies[1] > 2) {
-            /* not likely to carry more ACKs, skip it to simplify logic */
+        if (tx->tx_msg.ksm_zc_cookies[0] - tx->tx_msg.ksm_zc_cookies[1]
+            > 2) {
+            /* not likely to carry more ACKs,
+               skip it to simplify logic */
             ksocknal_next_tx_carrier(conn);
         }

@@ -220,7 +225,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
         __u64   tmp = 0;

         /* two separated cookies: (a+2, a) or (a+1, a) */
-        LASSERT (tx->tx_msg.ksm_zc_cookies[0] -
+        LASSERT(tx->tx_msg.ksm_zc_cookies[0] -
              tx->tx_msg.ksm_zc_cookies[1] <= 2);

         if (tx->tx_msg.ksm_zc_cookies[0] -
@@ -241,7 +246,8 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn,
         }

     } else {
-        /* ksm_zc_cookies[0] < ksm_zc_cookies[1], it is range of cookies */
+        /* ksm_zc_cookies[0] < ksm_zc_cookies[1],
+           it is range of cookies */
         if (cookie >= tx->tx_msg.ksm_zc_cookies[0] &&
             cookie <= tx->tx_msg.ksm_zc_cookies[1]) {
             CWARN("%s: duplicated ZC cookie: %llu\n",
@@ -408,7 +414,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64
cookie1, __u64 cookie2)
     ksock_peer_t      *peer = conn->ksnc_peer;
     ksock_tx_t    *tx;
     ksock_tx_t    *tmp;
-    LIST_HEAD     (zlist);
+    LIST_HEAD(zlist);
     int        count;

     if (cookie1 == 0)
@@ -428,7 +434,8 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64
cookie1, __u64 cookie2)
                      &peer->ksnp_zc_req_list, tx_zc_list) {
         __u64 c = tx->tx_msg.ksm_zc_cookies[0];

-        if (c == cookie1 || c == cookie2 || (cookie1 < c && c < cookie2)) {
+        if (c == cookie1 || c == cookie2
+            || (cookie1 < c && c < cookie2)) {
             tx->tx_msg.ksm_zc_cookies[0] = 0;
             list_del(&tx->tx_zc_list);
             list_add(&tx->tx_zc_list, &zlist);
@@ -450,7 +457,7 @@ ksocknal_handle_zcack(ksock_conn_t *conn, __u64
cookie1, __u64 cookie2)
 }

 static int
-ksocknal_send_hello_v1 (ksock_conn_t *conn, ksock_hello_msg_t *hello)
+ksocknal_send_hello_v1(ksock_conn_t *conn, ksock_hello_msg_t *hello)
 {
     struct socket    *sock = conn->ksnc_sock;
     lnet_hdr_t      *hdr;
@@ -507,9 +514,8 @@ ksocknal_send_hello_v1 (ksock_conn_t *conn,
ksock_hello_msg_t *hello)
     if (hello->kshm_nips == 0)
         goto out;

-    for (i = 0; i < (int) hello->kshm_nips; i++) {
+    for (i = 0; i < (int) hello->kshm_nips; i++)
         hello->kshm_ips[i] = __cpu_to_le32 (hello->kshm_ips[i]);
-    }

     rc = libcfs_sock_write(sock, hello->kshm_ips,
                    hello->kshm_nips * sizeof(__u32),
@@ -526,7 +532,7 @@ out:
 }

 static int
-ksocknal_send_hello_v2 (ksock_conn_t *conn, ksock_hello_msg_t *hello)
+ksocknal_send_hello_v2(ksock_conn_t *conn, ksock_hello_msg_t *hello)
 {
     struct socket *sock = conn->ksnc_sock;
     int         rc;
@@ -544,7 +550,8 @@ ksocknal_send_hello_v2 (ksock_conn_t *conn,
ksock_hello_msg_t *hello)
         LNET_UNLOCK();
     }

-    rc = libcfs_sock_write(sock, hello, offsetof(ksock_hello_msg_t, kshm_ips),
+    rc = libcfs_sock_write(sock, hello,
+                   offsetof(ksock_hello_msg_t, kshm_ips),
                    lnet_acceptor_timeout());

     if (rc != 0) {
@@ -584,12 +591,12 @@ ksocknal_recv_hello_v1(ksock_conn_t *conn,
ksock_hello_msg_t *hello,
     }

     rc = libcfs_sock_read(sock, &hdr->src_nid,
-                  sizeof (*hdr) - offsetof (lnet_hdr_t, src_nid),
+                  sizeof(*hdr) - offsetof(lnet_hdr_t, src_nid),
                   timeout);
     if (rc != 0) {
         CERROR("Error %d reading rest of HELLO hdr from %pI4h\n",
             rc, &conn->ksnc_ipaddr);
-        LASSERT (rc < 0 && rc != -EALREADY);
+        LASSERT(rc < 0 && rc != -EALREADY);
         goto out;
     }

@@ -602,12 +609,12 @@ ksocknal_recv_hello_v1(ksock_conn_t *conn,
ksock_hello_msg_t *hello,
         goto out;
     }

-    hello->kshm_src_nid     = le64_to_cpu (hdr->src_nid);
-    hello->kshm_src_pid     = le32_to_cpu (hdr->src_pid);
-    hello->kshm_src_incarnation = le64_to_cpu (hdr->msg.hello.incarnation);
-    hello->kshm_ctype       = le32_to_cpu (hdr->msg.hello.type);
-    hello->kshm_nips        = le32_to_cpu (hdr->payload_length) /
-                     sizeof (__u32);
+    hello->kshm_src_nid     = le64_to_cpu(hdr->src_nid);
+    hello->kshm_src_pid     = le32_to_cpu(hdr->src_pid);
+    hello->kshm_src_incarnation = le64_to_cpu(hdr->msg.hello.incarnation);
+    hello->kshm_ctype       = le32_to_cpu(hdr->msg.hello.type);
+    hello->kshm_nips        = le32_to_cpu(hdr->payload_length) /
+                     sizeof(__u32);

     if (hello->kshm_nips > LNET_MAX_INTERFACES) {
         CERROR("Bad nips %d from ip %pI4h\n",
@@ -645,7 +652,8 @@ out:
 }

 static int
-ksocknal_recv_hello_v2 (ksock_conn_t *conn, ksock_hello_msg_t *hello,
int timeout)
+ksocknal_recv_hello_v2(ksock_conn_t *conn,
+               ksock_hello_msg_t *hello, int timeout)
 {
     struct socket   *sock = conn->ksnc_sock;
     int        rc;
@@ -658,7 +666,7 @@ ksocknal_recv_hello_v2 (ksock_conn_t *conn,
ksock_hello_msg_t *hello, int timeou

     rc = libcfs_sock_read(sock, &hello->kshm_src_nid,
                   offsetof(ksock_hello_msg_t, kshm_ips) -
-                       offsetof(ksock_hello_msg_t, kshm_src_nid),
+                  offsetof(ksock_hello_msg_t, kshm_src_nid),
                   timeout);
     if (rc != 0) {
         CERROR("Error %d reading HELLO from %pI4h\n",
@@ -720,7 +728,8 @@ ksocknal_pack_msg_v1(ksock_tx_t *tx)
     tx->tx_iov[0].iov_base = &tx->tx_lnetmsg->msg_hdr;
     tx->tx_iov[0].iov_len  = sizeof(lnet_hdr_t);

-    tx->tx_resid = tx->tx_nob = tx->tx_lnetmsg->msg_len + sizeof(lnet_hdr_t);
+    tx->tx_resid = tx->tx_lnetmsg->msg_len + sizeof(lnet_hdr_t);
+    tx->tx_nob = tx->tx_lnetmsg->msg_len + sizeof(lnet_hdr_t);
 }

 static void
@@ -733,14 +742,18 @@ ksocknal_pack_msg_v2(ksock_tx_t *tx)

         tx->tx_msg.ksm_u.lnetmsg.ksnm_hdr = tx->tx_lnetmsg->msg_hdr;
         tx->tx_iov[0].iov_len = sizeof(ksock_msg_t);
-        tx->tx_resid = tx->tx_nob = sizeof(ksock_msg_t) +
tx->tx_lnetmsg->msg_len;
+        tx->tx_resid = sizeof(ksock_msg_t) + tx->tx_lnetmsg->msg_len;
+        tx->tx_nob = sizeof(ksock_msg_t) + tx->tx_lnetmsg->msg_len;
     } else {
         LASSERT(tx->tx_msg.ksm_type == KSOCK_MSG_NOOP);

-        tx->tx_iov[0].iov_len = offsetof(ksock_msg_t, ksm_u.lnetmsg.ksnm_hdr);
-        tx->tx_resid = tx->tx_nob = offsetof(ksock_msg_t,
ksm_u.lnetmsg.ksnm_hdr);
+        tx->tx_iov[0].iov_len = offsetof(ksock_msg_t,
+                         ksm_u.lnetmsg.ksnm_hdr);
+        tx->tx_resid = tx->tx_nob = offsetof(ksock_msg_t,
+                             ksm_u.lnetmsg.ksnm_hdr);
     }
-    /* Don't checksum before start sending, because packet can be
piggybacked with ACK */
+    /* Don't checksum before start sending,
+       because packet can be piggybacked with ACK */
 }

 static void
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists