io-wq: remove unused io-wq refcounting

[linux-2.6-microblaze.git] / fs / io-wq.c

diff --git a/fs/io-wq.c b/fs/io-wq.c
index b3e8624..f058ea0 100644 (file)
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -102,7 +102,6 @@ struct io_wqe {
  * Per io_wq state
   */
 struct io_wq {
-       struct io_wqe **wqes;
        unsigned long state;
 
        free_work_fn *free_work;
@@ -110,14 +109,14 @@ struct io_wq {
 
        struct io_wq_hash *hash;
 
-       refcount_t refs;
-
        atomic_t worker_refs;
        struct completion worker_done;
 
        struct hlist_node cpuhp_node;
 
        struct task_struct *task;
+
+       struct io_wqe *wqes[];
 };
 
 static enum cpuhp_state io_wq_online;
@@ -907,17 +906,12 @@ struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
        if (WARN_ON_ONCE(!data->free_work || !data->do_work))
                return ERR_PTR(-EINVAL);
 
-       wq = kzalloc(sizeof(*wq), GFP_KERNEL);
+       wq = kzalloc(struct_size(wq, wqes, nr_node_ids), GFP_KERNEL);
        if (!wq)
                return ERR_PTR(-ENOMEM);
-
-       wq->wqes = kcalloc(nr_node_ids, sizeof(struct io_wqe *), GFP_KERNEL);
-       if (!wq->wqes)
-               goto err_wq;
-
        ret = cpuhp_state_add_instance_nocalls(io_wq_online, &wq->cpuhp_node);
        if (ret)
-               goto err_wqes;
+               goto err_wq;
 
        refcount_inc(&data->hash->refs);
        wq->hash = data->hash;
@@ -953,7 +947,6 @@ struct io_wq *io_wq_create(unsigned bounded, struct io_wq_data *data)
        }
 
        wq->task = get_task_struct(data->task);
-       refcount_set(&wq->refs, 1);
        atomic_set(&wq->worker_refs, 1);
        init_completion(&wq->worker_done);
        return wq;
@@ -962,8 +955,6 @@ err:
        cpuhp_state_remove_instance_nocalls(io_wq_online, &wq->cpuhp_node);
        for_each_node(node)
                kfree(wq->wqes[node]);
-err_wqes:
-       kfree(wq->wqes);
 err_wq:
        kfree(wq);
        return ERR_PTR(ret);
@@ -1036,7 +1027,6 @@ static void io_wq_destroy(struct io_wq *wq)
                kfree(wqe);
        }
        io_wq_put_hash(wq->hash);
-       kfree(wq->wqes);
        kfree(wq);
 }
 
@@ -1045,8 +1035,7 @@ void io_wq_put_and_exit(struct io_wq *wq)
        WARN_ON_ONCE(!test_bit(IO_WQ_BIT_EXIT, &wq->state));
 
        io_wq_exit_workers(wq);
-       if (refcount_dec_and_test(&wq->refs))
-               io_wq_destroy(wq);
+       io_wq_destroy(wq);
 }
 
 static bool io_wq_worker_affinity(struct io_worker *worker, void *data)