diff options
| author | Alexander Viro <viro@math.psu.edu> | 2002-08-10 02:21:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-08-10 02:21:36 -0700 |
| commit | 814bd2ba199743fb93045459f28f521036671b86 (patch) | |
| tree | 703864fc6ac162e26356e2166f4562609b7f8d3e /drivers/ide | |
| parent | 5c2f64032dc44de9ce42a9c52dbe675f6cafba1d (diff) | |
[PATCH] make check_disk_change() use struct block_device
check_disk_change() converted to passing struct block_device.
Old variant is still needed for a couple of places; wrapper
is provided (__check_disk_change(kdev)). do_open() logics
with setting ->bd_op sanitized - now we do that before calling
->open().
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-disk.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-floppy.c | 2 | ||||
| -rw-r--r-- | drivers/ide/ide-pmac.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index 58499ebbfa4e..1d05083bbfc5 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c @@ -659,7 +659,7 @@ static int idedisk_open(struct inode *inode, struct file *__fp, struct ata_devic { MOD_INC_USE_COUNT; if (drive->removable && drive->usage == 1) { - check_disk_change(inode->i_rdev); + check_disk_change(inode->i_bdev); /* * Ignore the return code from door_lock, since the open() has diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 56d076b902ff..5220ed1c3b26 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c @@ -1496,7 +1496,7 @@ static int idefloppy_open(struct inode *inode, struct file *filp, struct ata_dev idefloppy_create_prevent_cmd (&pc, 1); (void) idefloppy_queue_pc_tail (drive, &pc); } - check_disk_change(inode->i_rdev); + check_disk_change(inode->i_bdev); } else if (test_bit(IDEFLOPPY_FORMAT_IN_PROGRESS, &floppy->flags)) { diff --git a/drivers/ide/ide-pmac.c b/drivers/ide/ide-pmac.c index 4630dbc4fe5d..4c5a3dbab4c8 100644 --- a/drivers/ide/ide-pmac.c +++ b/drivers/ide/ide-pmac.c @@ -1558,7 +1558,7 @@ idepmac_wake_device(struct ata_device *drive, int used_dma) ata_ops(drive)->check_media_change(drive); /* We kick the VFS too (see fix in ide.c revalidate) */ - check_disk_change(mk_kdev(drive->channel->major, (drive->select.b.unit) << PARTN_BITS)); + __check_disk_change(MKDEV(drive->channel->major, (drive->select.b.unit) << PARTN_BITS)); #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC /* We re-enable DMA on the drive if it was active. */ |