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/block/loop.c | |
| parent | df6db302cb236ac3a683d535a3e2073d9f4b2833 (diff) | |
| parent | c4a1745aa09fc110afdefea0e5d025043e348bae (diff) | |
Merge branch 'linus'
Diffstat (limited to 'drivers/block/loop.c')
| -rw-r--r-- | drivers/block/loop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index 5f6d1a5cce11..0010704739e3 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -1307,7 +1307,7 @@ static int __init loop_init(void) | |||
| 1307 | 1307 | ||
| 1308 | out_mem4: | 1308 | out_mem4: |
| 1309 | while (i--) | 1309 | while (i--) |
| 1310 | blk_put_queue(loop_dev[i].lo_queue); | 1310 | blk_cleanup_queue(loop_dev[i].lo_queue); |
| 1311 | devfs_remove("loop"); | 1311 | devfs_remove("loop"); |
| 1312 | i = max_loop; | 1312 | i = max_loop; |
| 1313 | out_mem3: | 1313 | out_mem3: |
| @@ -1328,7 +1328,7 @@ static void loop_exit(void) | |||
| 1328 | 1328 | ||
| 1329 | for (i = 0; i < max_loop; i++) { | 1329 | for (i = 0; i < max_loop; i++) { |
| 1330 | del_gendisk(disks[i]); | 1330 | del_gendisk(disks[i]); |
| 1331 | blk_put_queue(loop_dev[i].lo_queue); | 1331 | blk_cleanup_queue(loop_dev[i].lo_queue); |
| 1332 | put_disk(disks[i]); | 1332 | put_disk(disks[i]); |
| 1333 | } | 1333 | } |
| 1334 | devfs_remove("loop"); | 1334 | devfs_remove("loop"); |