Thread (3 messages) 3 messages, 3 authors, 2011-03-11

Re: linux-next: Tree for March 11 (block/mm/fs)

From: Jens Axboe <axboe@kernel.dk>
Date: 2011-03-11 19:18:53
Also in: lkml
Subsystem: block layer, the rest · Maintainers: Jens Axboe, Linus Torvalds

On 2011-03-11 18:53, Randy Dunlap wrote:
On Fri, 11 Mar 2011 18:41:15 +1100 Stephen Rothwell wrote:
quoted
Hi all,

Changes since 20110310:

The block tree lost its build failure but gained another for which I
applied a patch.

When CONFIG_BLOCK is not enabled:

mm/filemap.c:1257: error: storage size of 'plug' isn't known
mm/filemap.c:2450: error: storage size of 'plug' isn't known
mm/readahead.c:112: error: storage size of 'plug' isn't known
fs/aio.c:1625: error: storage size of 'plug' isn't known
Thanks Randy, I fixed it up.
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 91fa428..16a902f 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)
 {
 }
 
-- 
Jens Axboe
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help