LU-12960 lod: don't set index for 2nd stripe if specific

[fs/lustre-release.git] / lnet / selftest / selftest.h

diff --git a/lnet/selftest/selftest.h b/lnet/selftest/selftest.h
index 1a39cd7..c14f9e1 100644 (file)
--- a/lnet/selftest/selftest.h
+++ b/lnet/selftest/selftest.h
@@ -151,11 +151,11 @@ struct srpc_event {
 
 /* bulk descriptor */
 struct srpc_bulk {
-        int              bk_len;  /* len of bulk data */
-       struct lnet_handle_md bk_mdh;
-        int              bk_sink; /* sink/source */
-        int              bk_niov; /* # iov in bk_iovs */
-        lnet_kiov_t      bk_iovs[0];
+       int                     bk_len;  /* len of bulk data */
+       struct lnet_handle_md   bk_mdh;
+       int                     bk_sink; /* sink/source */
+       int                     bk_niov; /* # iov in bk_iovs */
+       struct bio_vec          bk_iovs[0];
 };
 
 /* message buffer descriptor */
@@ -578,8 +578,8 @@ do {                                                                        \
                       fmt, ## __VA_ARGS__);                            \
                spin_unlock(&(lock));                                   \
                                                                        \
-               set_current_state(TASK_UNINTERRUPTIBLE);                \
-               schedule_timeout(cfs_time_seconds(1) / 10);             \
+               schedule_timeout_uninterruptible(                       \
+                       cfs_time_seconds(1) / 10);                      \
                                                                        \
                spin_lock(&(lock));                                     \
        }                                                               \
@@ -597,8 +597,7 @@ srpc_wait_service_shutdown(struct srpc_service *sv)
                CDEBUG(((i & -i) == i) ? D_WARNING : D_NET,
                       "Waiting for %s service to shutdown...\n",
                       sv->sv_name);
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               schedule_timeout(cfs_time_seconds(1) / 10);
+               schedule_timeout_uninterruptible(cfs_time_seconds(1) / 10);
        }
 }