block: remove get_io_context_active

Fold it into it's only caller, and remove a lof of the debug checks
that are not needed.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/block/blk-ioc.c b/block/blk-ioc.c
index 3ba15c867dfa65128e73fb85ac586cb5e1e3c032..cc4eb2ba87f7438556df5205c3d0ee0aaa9ff445 100644 (file)
--- a/block/blk-ioc.c
+++ b/block/blk-ioc.c
@@ -173,7 +173,7 @@ EXPORT_SYMBOL_GPL(put_io_context);
  * put_io_context_active - put active reference on ioc
  * @ioc: ioc of interest
  *
- * Undo get_io_context_active().  If active reference reaches zero after
+ * Put an active reference to an ioc.  If active reference reaches zero after
  * put, @ioc can never issue further IOs and ioscheds are notified.
  */
 static void put_io_context_active(struct io_context *ioc)
@@ -333,11 +333,9 @@ int __copy_io(unsigned long clone_flags, struct task_struct *tsk)
         * Share io context with parent, if CLONE_IO is set
         */
        if (clone_flags & CLONE_IO) {
-               get_io_context_active(ioc);
-
-               WARN_ON_ONCE(atomic_read(&ioc->nr_tasks) <= 0);
+               atomic_long_inc(&ioc->refcount);
+               atomic_inc(&ioc->active_ref);
                atomic_inc(&ioc->nr_tasks);
-
                tsk->io_context = ioc;
        } else if (ioprio_valid(ioc->ioprio)) {
                new_ioc = get_task_io_context(tsk, GFP_KERNEL, NUMA_NO_NODE);

diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 3ba45953d522823effbea36697e21ac4eaac3e21..c1229fbd6691c04bfe746b1d04014f0b637e43f1 100644 (file)
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -113,22 +113,6 @@ struct io_context {
        struct work_struct release_work;
 };
 
-/**
- * get_io_context_active - get active reference on ioc
- * @ioc: ioc of interest
- *
- * Only iocs with active reference can issue new IOs.  This function
- * acquires an active reference on @ioc.  The caller must already have an
- * active reference on @ioc.
- */
-static inline void get_io_context_active(struct io_context *ioc)
-{
-       WARN_ON_ONCE(atomic_long_read(&ioc->refcount) <= 0);
-       WARN_ON_ONCE(atomic_read(&ioc->active_ref) <= 0);
-       atomic_long_inc(&ioc->refcount);
-       atomic_inc(&ioc->active_ref);
-}
-
 struct task_struct;
 #ifdef CONFIG_BLOCK
 void put_io_context(struct io_context *ioc);