From: Jens Axboe <jaxboe@fusionio.com>
Date: Fri, 11 Mar 2011 19:17:08 +0000 (+0100)
Subject: block: fixup plugging stubs for !CONFIG_BLOCK
X-Git-Tag: v2.6.39-rc1~80^2~17
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=1f940bdfc0d03265d178d9dfd840d854819f797d;p=linux.git

block: fixup plugging stubs for !CONFIG_BLOCK

They used an older prototype, fix it up.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
---

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 91fa428fa2c1..16a902f099ac 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1297,15 +1297,18 @@ static inline long nr_blockdev_pages(void)
 	return 0;
 }
 
-static inline void blk_start_plug(struct list_head *list)
+struct blk_plug {
+};
+
+static inline void blk_start_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_finish_plug(struct list_head *list)
+static inline void blk_finish_plug(struct blk_plug *plug)
 {
 }
 
-static inline void blk_flush_plug(struct task_struct *tsk)
+static inline void blk_flush_plug(struct task_struct *task)
 {
 }