drivers/block/floppy.c: Premature blk_queue_max_sectors()

Hi,

We're prematurely pampering the request queue before checking whether it was indeed allocated successfully.

Against 2.6.6. Thanks.

 floppy.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

@@ -4271,11 +4271,11 @@
 		goto out;
 
 	floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);
-	blk_queue_max_sectors(floppy_queue, 64);
 	if (!floppy_queue) {
 		err = -ENOMEM;
 		goto fail_queue;
 	}
+	blk_queue_max_sectors(floppy_queue, 64);
 
 	blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE,
 			    floppy_find, NULL, NULL);

Hi Arthur,

Em Fri, May 21, 2004 at 09:59:34PM +0200, Arthur Othieno escreveu:

| We're prematurely pampering the request queue before
| checking whether it was indeed allocated successfully.
| 
| Against 2.6.6. Thanks.
| 
| 
|  floppy.c |    2 +-
|  1 files changed, 1 insertion(+), 1 deletion(-)
| 
| --- a/drivers/block/floppy.c	2004-05-20 23:48:04.000000000 +0200
| +++ b/drivers/block/floppy.c	2004-05-21 21:29:33.000000000 +0200
| @@ -4271,11 +4271,11 @@
|  		goto out;
|  
|  	floppy_queue = blk_init_queue(do_fd_request, &floppy_lock);
| -	blk_queue_max_sectors(floppy_queue, 64);
|  	if (!floppy_queue) {
|  		err = -ENOMEM;
|  		goto fail_queue;
|  	}
| +	blk_queue_max_sectors(floppy_queue, 64);
|  
|  	blk_register_region(MKDEV(FLOPPY_MAJOR, 0), 256, THIS_MODULE,
|  			    floppy_find, NULL, NULL);

I and Randy did a (long) audit for floppy init sometime ago. It includes
your change. :-)

I think the patch will be in next -mm.

Luiz Fernando N. Capitulino
<http://www.telecentros.sp.gov.br>

snip

Glad to hear that. It was beginning to look a little too scary ;)

Arthur