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

[~andy/linux] / drivers / staging / lustre / lustre / ptlrpc / events.c

diff --git a/drivers/staging/lustre/lustre/ptlrpc/events.c b/drivers/staging/lustre/lustre/ptlrpc/events.c
index 58d089c3fef4905fe1ff1a8f7adc6e1c3b62a4aa..f66cfea87acfccb666f36ef0431141ee6aa25dbc 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/events.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/events.c
@@ -56,9 +56,9 @@ void request_out_callback(lnet_event_t *ev)
        struct ptlrpc_cb_id   *cbid = ev->md.user_ptr;
        struct ptlrpc_request *req = cbid->cbid_arg;
 
-       LASSERT (ev->type == LNET_EVENT_SEND ||
-                ev->type == LNET_EVENT_UNLINK);
-       LASSERT (ev->unlinked);
+       LASSERT(ev->type == LNET_EVENT_SEND ||
+               ev->type == LNET_EVENT_UNLINK);
+       LASSERT(ev->unlinked);
 
        DEBUG_REQ(D_NET, req, "type %d, status %d", ev->type, ev->status);
 
@@ -90,9 +90,9 @@ void reply_in_callback(lnet_event_t *ev)
 
        DEBUG_REQ(D_NET, req, "type %d, status %d", ev->type, ev->status);
 
-       LASSERT (ev->type == LNET_EVENT_PUT || ev->type == LNET_EVENT_UNLINK);
-       LASSERT (ev->md.start == req->rq_repbuf);
-       LASSERT (ev->offset + ev->mlength <= req->rq_repbuf_len);
+       LASSERT(ev->type == LNET_EVENT_PUT || ev->type == LNET_EVENT_UNLINK);
+       LASSERT(ev->md.start == req->rq_repbuf);
+       LASSERT(ev->offset + ev->mlength <= req->rq_repbuf_len);
        /* We've set LNET_MD_MANAGE_REMOTE for all outgoing requests
           for adaptive timeouts' early reply. */
        LASSERT((ev->md.options & LNET_MD_MANAGE_REMOTE) != 0);
@@ -113,7 +113,7 @@ void reply_in_callback(lnet_event_t *ev)
                goto out_wake;
        }
 
-       if (ev->mlength < ev->rlength ) {
+       if (ev->mlength < ev->rlength) {
                CDEBUG(D_RPCTRACE, "truncate req %p rpc %d - %d+%d\n", req,
                       req->rq_replen, ev->rlength, ev->offset);
                req->rq_reply_truncate = 1;
@@ -167,18 +167,18 @@ out_wake:
 /*
  * Client's bulk has been written/read
  */
-void client_bulk_callback (lnet_event_t *ev)
+void client_bulk_callback(lnet_event_t *ev)
 {
        struct ptlrpc_cb_id     *cbid = ev->md.user_ptr;
        struct ptlrpc_bulk_desc *desc = cbid->cbid_arg;
        struct ptlrpc_request   *req;
 
-       LASSERT ((desc->bd_type == BULK_PUT_SINK &&
-                 ev->type == LNET_EVENT_PUT) ||
-                (desc->bd_type == BULK_GET_SOURCE &&
-                 ev->type == LNET_EVENT_GET) ||
-                ev->type == LNET_EVENT_UNLINK);
-       LASSERT (ev->unlinked);
+       LASSERT((desc->bd_type == BULK_PUT_SINK &&
+                ev->type == LNET_EVENT_PUT) ||
+               (desc->bd_type == BULK_GET_SOURCE &&
+                ev->type == LNET_EVENT_GET) ||
+               ev->type == LNET_EVENT_UNLINK);
+       LASSERT(ev->unlinked);
 
        if (CFS_FAIL_CHECK_ORSET(OBD_FAIL_PTLRPC_CLIENT_BULK_CB, CFS_FAIL_ONCE))
                ev->status = -EIO;
@@ -283,11 +283,11 @@ void request_in_callback(lnet_event_t *ev)
        struct ptlrpc_service        *service = svcpt->scp_service;
        struct ptlrpc_request        *req;
 
-       LASSERT (ev->type == LNET_EVENT_PUT ||
-                ev->type == LNET_EVENT_UNLINK);
-       LASSERT ((char *)ev->md.start >= rqbd->rqbd_buffer);
-       LASSERT ((char *)ev->md.start + ev->offset + ev->mlength <=
-                rqbd->rqbd_buffer + service->srv_buf_size);
+       LASSERT(ev->type == LNET_EVENT_PUT ||
+               ev->type == LNET_EVENT_UNLINK);
+       LASSERT((char *)ev->md.start >= rqbd->rqbd_buffer);
+       LASSERT((char *)ev->md.start + ev->offset + ev->mlength <=
+               rqbd->rqbd_buffer + service->srv_buf_size);
 
        CDEBUG((ev->status == 0) ? D_NET : D_ERROR,
               "event type %d, status %d, service %s\n",
@@ -300,9 +300,9 @@ void request_in_callback(lnet_event_t *ev)
                 * we'd have to re-post the rqbd, which we can't do in this
                 * context. */
                req = &rqbd->rqbd_req;
-               memset(req, 0, sizeof (*req));
+               memset(req, 0, sizeof(*req));
        } else {
-               LASSERT (ev->type == LNET_EVENT_PUT);
+               LASSERT(ev->type == LNET_EVENT_PUT);
                if (ev->status != 0) {
                        /* We moaned above already... */
                        return;
@@ -381,19 +381,19 @@ void reply_out_callback(lnet_event_t *ev)
        struct ptlrpc_reply_state *rs = cbid->cbid_arg;
        struct ptlrpc_service_part *svcpt = rs->rs_svcpt;
 
-       LASSERT (ev->type == LNET_EVENT_SEND ||
-                ev->type == LNET_EVENT_ACK ||
-                ev->type == LNET_EVENT_UNLINK);
+       LASSERT(ev->type == LNET_EVENT_SEND ||
+               ev->type == LNET_EVENT_ACK ||
+               ev->type == LNET_EVENT_UNLINK);
 
        if (!rs->rs_difficult) {
                /* 'Easy' replies have no further processing so I drop the
                 * net's ref on 'rs' */
-               LASSERT (ev->unlinked);
+               LASSERT(ev->unlinked);
                ptlrpc_rs_decref(rs);
                return;
        }
 
-       LASSERT (rs->rs_on_net);
+       LASSERT(rs->rs_on_net);
 
        if (ev->unlinked) {
                /* Last network callback. The net's ref on 'rs' stays put
@@ -419,18 +419,17 @@ static void ptlrpc_master_callback(lnet_event_t *ev)
        void (*callback)(lnet_event_t *ev) = cbid->cbid_fn;
 
        /* Honestly, it's best to find out early. */
-       LASSERT (cbid->cbid_arg != LP_POISON);
-       LASSERT (callback == request_out_callback ||
-                callback == reply_in_callback ||
-                callback == client_bulk_callback ||
-                callback == request_in_callback ||
-                callback == reply_out_callback
-                );
-
-       callback (ev);
+       LASSERT(cbid->cbid_arg != LP_POISON);
+       LASSERT(callback == request_out_callback ||
+               callback == reply_in_callback ||
+               callback == client_bulk_callback ||
+               callback == request_in_callback ||
+               callback == reply_out_callback);
+
+       callback(ev);
 }
 
-int ptlrpc_uuid_to_peer (struct obd_uuid *uuid,
+int ptlrpc_uuid_to_peer(struct obd_uuid *uuid,
                         lnet_process_id_t *peer, lnet_nid_t *self)
 {
        int            best_dist = 0;
@@ -538,7 +537,7 @@ int ptlrpc_ni_init(void)
        /* We're not passing any limits yet... */
        rc = LNetNIInit(pid);
        if (rc < 0) {
-               CDEBUG (D_NET, "Can't init network interface: %d\n", rc);
+               CDEBUG(D_NET, "Can't init network interface: %d\n", rc);
                return (-ENOENT);
        }
 
@@ -552,7 +551,7 @@ int ptlrpc_ni_init(void)
        if (rc == 0)
                return 0;
 
-       CERROR ("Failed to allocate event queue: %d\n", rc);
+       CERROR("Failed to allocate event queue: %d\n", rc);
        LNetNIFini();
 
        return (-ENOMEM);