[dm-devel] [PATCH] Get rid of struct dm_deferred_io
Christophe Saout
christophe at saout.de
Thu Jan 1 15:17:02 UTC 2004
Hi!
We can get rid of dm_deferred_io in dm.c. We are doing it elsewhere,
others are doing it, so let's also do it.
We can save a call to kmalloc (which can even fail). The bio->bi_next
field can be used by us as long as we own it, it is set NULL before
it is passed down to the next request queue.
diff -Nur linux.orig/drivers/md/dm.c linux/drivers/md/dm.c
--- linux.orig/drivers/md/dm.c 2004-01-01 01:06:55.000000000 +0100
+++ linux/drivers/md/dm.c 2004-01-01 21:49:16.118235408 +0100
@@ -43,11 +43,6 @@
union map_info info;
};
-struct deferred_io {
- struct bio *bio;
- struct deferred_io *next;
-};
-
/*
* Bits for the md->flags field.
*/
@@ -68,7 +63,7 @@
*/
atomic_t pending;
wait_queue_head_t wait;
- struct deferred_io *deferred;
+ struct bio *deferred;
/*
* The current mapping.
@@ -224,38 +219,20 @@
mempool_free(tio, md->tio_pool);
}
-static inline struct deferred_io *alloc_deferred(void)
-{
- return kmalloc(sizeof(struct deferred_io), GFP_NOIO);
-}
-
-static inline void free_deferred(struct deferred_io *di)
-{
- kfree(di);
-}
-
/*
* Add the bio to the list of deferred io.
*/
static int queue_io(struct mapped_device *md, struct bio *bio)
{
- struct deferred_io *di;
-
- di = alloc_deferred();
- if (!di)
- return -ENOMEM;
-
down_write(&md->lock);
if (!test_bit(DMF_BLOCK_IO, &md->flags)) {
up_write(&md->lock);
- free_deferred(di);
return 1;
}
- di->bio = bio;
- di->next = md->deferred;
- md->deferred = di;
+ bio->bi_next = md->deferred;
+ md->deferred = bio;
up_write(&md->lock);
return 0; /* deferred successfully */
@@ -813,14 +790,14 @@
/*
* Requeue the deferred bios by calling generic_make_request.
*/
-static void flush_deferred_io(struct deferred_io *c)
+static void flush_deferred_io(struct bio *c)
{
- struct deferred_io *n;
+ struct bio *n;
while (c) {
- n = c->next;
- generic_make_request(c->bio);
- free_deferred(c);
+ n = c->bi_next;
+ c->bi_next = NULL;
+ generic_make_request(c);
c = n;
}
}
@@ -902,7 +879,7 @@
int dm_resume(struct mapped_device *md)
{
- struct deferred_io *def;
+ struct bio *def;
down_write(&md->lock);
if (!md->map ||
More information about the dm-devel
mailing list