LU-4751 hsm: Fix sanity-hsm tests for non-mrsh $PDSH

[fs/lustre-release.git] / lnet / selftest / rpc.c

diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c
index 301a31a..b8cc842 100644 (file)
--- a/lnet/selftest/rpc.c
+++ b/lnet/selftest/rpc.c
@@ -142,7 +142,6 @@ srpc_bulk_t *
 srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink)
 {
        srpc_bulk_t  *bk;
-       struct page  **pages;
        int           i;
 
        LASSERT(bulk_npg > 0 && bulk_npg <= LNET_MAX_IOV);
@@ -159,18 +158,22 @@ srpc_alloc_bulk(int cpt, unsigned bulk_npg, unsigned bulk_len, int sink)
        bk->bk_len    = bulk_len;
        bk->bk_niov   = bulk_npg;
 #ifndef __KERNEL__
-       LIBCFS_CPT_ALLOC(pages, lnet_cpt_table(), cpt,
-                        sizeof(struct page *) * bulk_npg);
-       if (pages == NULL) {
-               LIBCFS_FREE(bk, offsetof(srpc_bulk_t, bk_iovs[bulk_npg]));
-               CERROR("Can't allocate page array for %d pages\n", bulk_npg);
-               return NULL;
-       }
+       {
+               struct page  **pages;
+
+               LIBCFS_CPT_ALLOC(pages, lnet_cpt_table(), cpt,
+                                sizeof(struct page *) * bulk_npg);
+               if (pages == NULL) {
+                       LIBCFS_FREE(bk, offsetof(srpc_bulk_t,
+                                   bk_iovs[bulk_npg]));
+                       CERROR("Can't allocate page array for %d pages\n",
+                               bulk_npg);
+                       return NULL;
+               }
 
-       memset(pages, 0, sizeof(struct page *) * bulk_npg);
-       bk->bk_pages = pages;
-#else
-       UNUSED(pages);
+               memset(pages, 0, sizeof(struct page *) * bulk_npg);
+               bk->bk_pages = pages;
+       }
 #endif
 
        for (i = 0; i < bulk_npg; i++) {
@@ -1164,7 +1167,7 @@ srpc_del_client_rpc_timer (srpc_client_rpc_t *rpc)
        while (rpc->crpc_timeout != 0) {
                spin_unlock(&rpc->crpc_lock);
 
-               cfs_schedule();
+               schedule();
 
                spin_lock(&rpc->crpc_lock);
        }
@@ -1441,21 +1444,21 @@ void
 srpc_lnet_ev_handler(lnet_event_t *ev)
 {
        struct srpc_service_cd  *scd;
-        srpc_event_t      *rpcev = ev->md.user_ptr;
-        srpc_client_rpc_t *crpc;
-        srpc_server_rpc_t *srpc;
-        srpc_buffer_t     *buffer;
-        srpc_service_t    *sv;
-        srpc_msg_t        *msg;
-        srpc_msg_type_t    type;
+       srpc_event_t      *rpcev = ev->md.user_ptr;
+       srpc_client_rpc_t *crpc;
+       srpc_server_rpc_t *srpc;
+       srpc_buffer_t     *buffer;
+       srpc_service_t    *sv;
+       srpc_msg_t        *msg;
+       srpc_msg_type_t    type;
 
-        LASSERT (!cfs_in_interrupt());
+       LASSERT (!in_interrupt());
 
-        if (ev->status != 0) {
+       if (ev->status != 0) {
                spin_lock(&srpc_data.rpc_glock);
                srpc_data.rpc_counters.errors++;
                spin_unlock(&srpc_data.rpc_glock);
-        }
+       }
 
         rpcev->ev_lnet = ev->type;