summaryrefslogtreecommitdiff
path: root/include/linux/iocontext.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2011-12-14 03:33:37 +0400
committerJens Axboe <axboe@kernel.dk>2011-12-14 03:33:37 +0400
commit42ec57a8f68311bbbf4ff96a5d33c8a2e90b9d05 (patch)
tree3aead2658435f53bd637967c5722358039acc390 /include/linux/iocontext.h
parenta73f730d013ff2788389fd0c46ad3e5510f124e6 (diff)
downloadlinux-42ec57a8f68311bbbf4ff96a5d33c8a2e90b9d05.tar.xz
block: misc ioc cleanups
* int return from put_io_context() wasn't used by anybody. Make it return void like other put functions and docbook-fy the function comment. * Reorder dummy declarations for !CONFIG_BLOCK case a bit. * Make alloc_ioc_context() use __GFP_ZERO allocation, take init out of if block and drop 0'ing. * Docbook-fy current_io_context() comment. This patch doesn't introduce any functional change. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'include/linux/iocontext.h')
-rw-r--r--include/linux/iocontext.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/iocontext.h b/include/linux/iocontext.h
index 5037a0ad2312..8a6ecb66346f 100644
--- a/include/linux/iocontext.h
+++ b/include/linux/iocontext.h
@@ -76,20 +76,14 @@ static inline struct io_context *ioc_task_link(struct io_context *ioc)
struct task_struct;
#ifdef CONFIG_BLOCK
-int put_io_context(struct io_context *ioc);
+void put_io_context(struct io_context *ioc);
void exit_io_context(struct task_struct *task);
struct io_context *get_io_context(gfp_t gfp_flags, int node);
struct io_context *alloc_io_context(gfp_t gfp_flags, int node);
#else
-static inline void exit_io_context(struct task_struct *task)
-{
-}
-
struct io_context;
-static inline int put_io_context(struct io_context *ioc)
-{
- return 1;
-}
+static inline void put_io_context(struct io_context *ioc) { }
+static inline void exit_io_context(struct task_struct *task) { }
#endif
#endif