LU-9679 modules: Use LIST_HEAD for declaring list_heads

[fs/lustre-release.git] / lustre / osc / osc_cache.c

diff --git a/lustre/osc/osc_cache.c b/lustre/osc/osc_cache.c
index 665a63a..891d560 100644 (file)
--- a/lustre/osc/osc_cache.c
+++ b/lustre/osc/osc_cache.c
@@ -961,9 +961,8 @@ static int osc_extent_wait(const struct lu_env *env, struct osc_extent *ext,
                        "%s: wait ext to %u timedout, recovery in progress?\n",
                        cli_name(osc_cli(obj)), state);
 
-               lwi = LWI_INTR(NULL, NULL);
-               rc = l_wait_event(ext->oe_waitq, extent_wait_cb(ext, state),
-                                 &lwi);
+               wait_event_idle(ext->oe_waitq, extent_wait_cb(ext, state));
+               rc = 0;
        }
        if (rc == 0 && ext->oe_rc < 0)
                rc = ext->oe_rc;
@@ -2086,7 +2085,7 @@ osc_send_write_rpc(const struct lu_env *env, struct client_obd *cli,
                   struct osc_object *osc)
 __must_hold(osc)
 {
-       struct list_head   rpclist = LIST_HEAD_INIT(rpclist);
+       LIST_HEAD(rpclist);
        struct osc_extent *ext;
        struct osc_extent *tmp;
        struct osc_extent *first = NULL;
@@ -2162,7 +2161,7 @@ __must_hold(osc)
 {
        struct osc_extent *ext;
        struct osc_extent *next;
-       struct list_head rpclist = LIST_HEAD_INIT(rpclist);
+       LIST_HEAD(rpclist);
        struct extent_rpc_data data = {
                .erd_rpc_list   = &rpclist,
                .erd_page_count = 0,
@@ -2795,7 +2794,7 @@ int osc_cache_truncate_start(const struct lu_env *env, struct osc_object *obj,
        struct osc_extent *ext;
        struct osc_extent *waiting = NULL;
        pgoff_t index;
-       struct list_head list = LIST_HEAD_INIT(list);
+       LIST_HEAD(list);
        int result = 0;
        bool partial;
        ENTRY;
@@ -3013,7 +3012,7 @@ int osc_cache_writeback_range(const struct lu_env *env, struct osc_object *obj,
                              pgoff_t start, pgoff_t end, int hp, int discard)
 {
        struct osc_extent *ext;
-       struct list_head discard_list = LIST_HEAD_INIT(discard_list);
+       LIST_HEAD(discard_list);
        bool unplug = false;
        int result = 0;
        ENTRY;