From 06f568a10c55badce72948c09ce35ecbcb78b852 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Thu, 11 Nov 2010 13:37:54 +0100
Subject: [PATCH] --- yaml --- r: 221849 b: refs/heads/master c:
 cedb4a7d9f6aedb0dce94d6285b69dcb3c10fa05 h: refs/heads/master i:   221847:
 21a7861c5f8f3febfdb25132bf0caa626695bd62 v: v3

---
 [refs]                          |  2 +-
 trunk/block/blk-ioc.c           | 14 --------------
 trunk/include/linux/iocontext.h |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 7ee36abbe5ab..349802856811 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17a9e7bbae178d1326e4631ab6350a272349c99d
+refs/heads/master: cedb4a7d9f6aedb0dce94d6285b69dcb3c10fa05
diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c
index d22c4c55c406..3c7a339fe381 100644
--- a/trunk/block/blk-ioc.c
+++ b/trunk/block/blk-ioc.c
@@ -153,20 +153,6 @@ struct io_context *get_io_context(gfp_t gfp_flags, int node)
 }
 EXPORT_SYMBOL(get_io_context);
 
-void copy_io_context(struct io_context **pdst, struct io_context **psrc)
-{
-	struct io_context *src = *psrc;
-	struct io_context *dst = *pdst;
-
-	if (src) {
-		BUG_ON(atomic_long_read(&src->refcount) == 0);
-		atomic_long_inc(&src->refcount);
-		put_io_context(dst);
-		*pdst = src;
-	}
-}
-EXPORT_SYMBOL(copy_io_context);
-
 static int __init blk_ioc_init(void)
 {
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
diff --git a/trunk/include/linux/iocontext.h b/trunk/include/linux/iocontext.h
index 3e70b21884a9..b2eee896dcbc 100644
--- a/trunk/include/linux/iocontext.h
+++ b/trunk/include/linux/iocontext.h
@@ -76,7 +76,6 @@ int 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);
-void copy_io_context(struct io_context **pdst, struct io_context **psrc);
 #else
 static inline void exit_io_context(struct task_struct *task)
 {