mirror of
https://github.com/SCST-project/scst.git
synced 2026-05-20 20:21:30 +00:00
37ba91d275
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@938 d57e44dd-8a1f-0410-8b47-8ef2f437770f
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
diff -upkr linux-2.6.30.1/block/blk-ioc.c linux-2.6.30.1/block/blk-ioc.c
|
|
--- linux-2.6.30.1/block/blk-ioc.c 2009-06-10 07:05:27.000000000 +0400
|
|
+++ linux-2.6.30.1/block/blk-ioc.c 2009-07-01 15:55:08.000000000 +0400
|
|
@@ -65,6 +65,21 @@ static void cfq_exit(struct io_context *
|
|
rcu_read_unlock();
|
|
}
|
|
|
|
+void __exit_io_context(struct io_context *ioc)
|
|
+{
|
|
+ if (ioc == NULL)
|
|
+ return;
|
|
+
|
|
+ if (atomic_dec_and_test(&ioc->nr_tasks)) {
|
|
+ if (ioc->aic && ioc->aic->exit)
|
|
+ ioc->aic->exit(ioc->aic);
|
|
+ cfq_exit(ioc);
|
|
+
|
|
+ put_io_context(ioc);
|
|
+ }
|
|
+}
|
|
+EXPORT_SYMBOL(__exit_io_context);
|
|
+
|
|
/* Called by the exitting task */
|
|
void exit_io_context(void)
|
|
{
|
|
@@ -75,13 +90,7 @@ void exit_io_context(void)
|
|
current->io_context = NULL;
|
|
task_unlock(current);
|
|
|
|
- if (atomic_dec_and_test(&ioc->nr_tasks)) {
|
|
- if (ioc->aic && ioc->aic->exit)
|
|
- ioc->aic->exit(ioc->aic);
|
|
- cfq_exit(ioc);
|
|
-
|
|
- put_io_context(ioc);
|
|
- }
|
|
+ __exit_io_context(ioc);
|
|
}
|
|
|
|
struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
|
|
@@ -105,6 +114,7 @@ struct io_context *alloc_io_context(gfp_
|
|
|
|
return ret;
|
|
}
|
|
+EXPORT_SYMBOL(alloc_io_context);
|
|
|
|
/*
|
|
* If the current task has no IO context then create one and initialise it.
|
|
diff -upkr linux-2.6.30.1/include/linux/iocontext.h linux-2.6.30.1/include/linux/iocontext.h
|
|
--- linux-2.6.30.1/include/linux/iocontext.h 2009-06-10 07:05:27.000000000 +0400
|
|
+++ linux-2.6.30.1/include/linux/iocontext.h 2009-07-01 15:20:24.000000000 +0400
|
|
@@ -103,7 +103,9 @@ static inline struct io_context *ioc_tas
|
|
int put_io_context(struct io_context *ioc);
|
|
void exit_io_context(void);
|
|
struct io_context *get_io_context(gfp_t gfp_flags, int node);
|
|
+#define SCST_IO_CONTEXT
|
|
struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
|
|
+void __exit_io_context(struct io_context *ioc);
|
|
void copy_io_context(struct io_context **pdst, struct io_context **psrc);
|
|
#else
|
|
static inline void exit_io_context(void)
|