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

[linux-2.6-block.git] / drivers / staging / lustre / lnet / klnds / o2iblnd / o2iblnd_cb.c

diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
index b94f7436ec192168d198c591e26c1c72ed2a7dd9..14c9c8d18d02a5dfb933d844768c07f8c3cb320a 100644 (file)
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
@@ -1487,7 +1487,7 @@ kiblnd_send (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
        switch (type) {
        default:
                LBUG();
-               return (-EIO);
+               return -EIO;
 
        case LNET_MSG_ACK:
                LASSERT (payload_nob == 0);
@@ -2080,7 +2080,7 @@ kiblnd_connreq_done(kib_conn_t *conn, int status)
 
        active = (conn->ibc_state == IBLND_CONN_ACTIVE_CONNECT);
 
-       CDEBUG(D_NET,"%s: active(%d), version(%x), status(%d)\n",
+       CDEBUG(D_NET, "%s: active(%d), version(%x), status(%d)\n",
               libcfs_nid2str(peer->ibp_nid), active,
               conn->ibc_version, status);
 
@@ -2848,7 +2848,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
        case RDMA_CM_EVENT_ADDR_RESOLVED:
                peer = (kib_peer_t *)cmid->context;
 
-               CDEBUG(D_NET,"%s Addr resolved: %d\n",
+               CDEBUG(D_NET, "%s Addr resolved: %d\n",
                       libcfs_nid2str(peer->ibp_nid), event->status);
 
                if (event->status != 0) {
@@ -2878,7 +2878,7 @@ kiblnd_cm_callback(struct rdma_cm_id *cmid, struct rdma_cm_event *event)
 
        case RDMA_CM_EVENT_ROUTE_RESOLVED:
                peer = (kib_peer_t *)cmid->context;
-               CDEBUG(D_NET,"%s Route resolved: %d\n",
+               CDEBUG(D_NET, "%s Route resolved: %d\n",
                       libcfs_nid2str(peer->ibp_nid), event->status);
 
                if (event->status == 0)