Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

[pandora-kernel.git] / fs / dlm / lowcomms.c

diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c
index 5e2c71f..990626e 100644 (file)
--- a/fs/dlm/lowcomms.c
+++ b/fs/dlm/lowcomms.c
@@ -512,12 +512,10 @@ static void process_sctp_notification(struct connection *con,
                        }
                        make_sockaddr(&prim.ssp_addr, 0, &addr_len);
                        if (dlm_addr_to_nodeid(&prim.ssp_addr, &nodeid)) {
-                               int i;
                                unsigned char *b=(unsigned char *)&prim.ssp_addr;
                                log_print("reject connect from unknown addr");
-                               for (i=0; i<sizeof(struct sockaddr_storage);i++)
-                                       printk("%02x ", b[i]);
-                               printk("\n");
+                               print_hex_dump_bytes("ss: ", DUMP_PREFIX_NONE, 
+                                                    b, sizeof(struct sockaddr_storage));
                                sctp_send_shutdown(prim.ssp_assoc_id);
                                return;
                        }
@@ -748,7 +746,10 @@ static int tcp_accept_from_sock(struct connection *con)
        /* Get the new node's NODEID */
        make_sockaddr(&peeraddr, 0, &len);
        if (dlm_addr_to_nodeid(&peeraddr, &nodeid)) {
+               unsigned char *b=(unsigned char *)&peeraddr;
                log_print("connect from non cluster node");
+               print_hex_dump_bytes("ss: ", DUMP_PREFIX_NONE, 
+                                    b, sizeof(struct sockaddr_storage));
                sock_release(newsock);
                mutex_unlock(&con->sock_mutex);
                return -1;