diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-21 12:08:21 -0500 |
commit | ac58c9059da8886b5e8cde012a80266b18ca146e (patch) | |
tree | 40bf486843a2cace6c3a959d73423e50e6aa0c00 /drivers/md/dm.c | |
parent | df6db302cb236ac3a683d535a3e2073d9f4b2833 (diff) | |
parent | c4a1745aa09fc110afdefea0e5d025043e348bae (diff) |
Merge branch 'linus'
Diffstat (limited to 'drivers/md/dm.c')
-rw-r--r-- | drivers/md/dm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 745ca1f67b14..88d60202b9db 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -840,7 +840,7 @@ static struct mapped_device *alloc_dev(unsigned int minor, int persistent) | |||
840 | bad3: | 840 | bad3: |
841 | mempool_destroy(md->io_pool); | 841 | mempool_destroy(md->io_pool); |
842 | bad2: | 842 | bad2: |
843 | blk_put_queue(md->queue); | 843 | blk_cleanup_queue(md->queue); |
844 | free_minor(minor); | 844 | free_minor(minor); |
845 | bad1: | 845 | bad1: |
846 | kfree(md); | 846 | kfree(md); |
@@ -860,7 +860,7 @@ static void free_dev(struct mapped_device *md) | |||
860 | del_gendisk(md->disk); | 860 | del_gendisk(md->disk); |
861 | free_minor(minor); | 861 | free_minor(minor); |
862 | put_disk(md->disk); | 862 | put_disk(md->disk); |
863 | blk_put_queue(md->queue); | 863 | blk_cleanup_queue(md->queue); |
864 | kfree(md); | 864 | kfree(md); |
865 | } | 865 | } |
866 | 866 | ||