* [PATCH] hd: stop defining MAJOR_NR
@ 2009-06-16 19:17 Christoph Hellwig
2009-06-16 20:13 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Christoph Hellwig @ 2009-06-16 19:17 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel
Just use HD_MAJOR directly.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Index: linux-2.6/drivers/block/hd.c
===================================================================
--- linux-2.6.orig/drivers/block/hd.c 2009-06-11 20:54:27.184814475 +0200
+++ linux-2.6/drivers/block/hd.c 2009-06-16 21:16:19.716938868 +0200
@@ -100,8 +100,6 @@ static DEFINE_SPINLOCK(hd_lock);
static struct request_queue *hd_queue;
static struct request *hd_req;
-#define MAJOR_NR HD_MAJOR
-
#define TIMEOUT_VALUE (6*HZ)
#define HD_DELAY 0
@@ -712,12 +710,12 @@ static int __init hd_init(void)
{
int drive;
- if (register_blkdev(MAJOR_NR, "hd"))
+ if (register_blkdev(HD_MAJOR, "hd"))
return -1;
hd_queue = blk_init_queue(do_hd_request, &hd_lock);
if (!hd_queue) {
- unregister_blkdev(MAJOR_NR, "hd");
+ unregister_blkdev(HD_MAJOR, "hd");
return -ENOMEM;
}
@@ -751,7 +749,7 @@ static int __init hd_init(void)
struct hd_i_struct *p = &hd_info[drive];
if (!disk)
goto Enomem;
- disk->major = MAJOR_NR;
+ disk->major = HD_MAJOR;
disk->first_minor = drive << 6;
disk->fops = &hd_fops;
sprintf(disk->disk_name, "hd%c", 'a'+drive);
@@ -795,7 +793,7 @@ out1:
NR_HD = 0;
out:
del_timer(&device_timer);
- unregister_blkdev(MAJOR_NR, "hd");
+ unregister_blkdev(HD_MAJOR, "hd");
blk_cleanup_queue(hd_queue);
return -1;
Enomem:
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] hd: stop defining MAJOR_NR
2009-06-16 19:17 [PATCH] hd: stop defining MAJOR_NR Christoph Hellwig
@ 2009-06-16 20:13 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2009-06-16 20:13 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linux-kernel
On Tue, Jun 16 2009, Christoph Hellwig wrote:
> Just use HD_MAJOR directly.
Thanks, applied.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-16 20:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-16 19:17 [PATCH] hd: stop defining MAJOR_NR Christoph Hellwig
2009-06-16 20:13 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox