summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/acorn/block/mfmhd.c2
-rw-r--r--drivers/block/DAC960.c2
-rw-r--r--drivers/block/acsi.c2
-rw-r--r--drivers/block/ataflop.c2
-rw-r--r--drivers/block/blkpg.c6
-rw-r--r--drivers/block/cciss.c2
-rw-r--r--drivers/block/cpqarray.c2
-rw-r--r--drivers/block/floppy.c2
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/block/paride/pd.c2
-rw-r--r--drivers/block/paride/pf.c2
-rw-r--r--drivers/block/ps2esdi.c2
-rw-r--r--drivers/block/rd.c2
-rw-r--r--drivers/block/xd.c2
-rw-r--r--drivers/cdrom/cdrom.c2
-rw-r--r--drivers/ide/hd.c2
-rw-r--r--drivers/ide/hptraid.c2
-rw-r--r--drivers/ide/ide.c2
-rw-r--r--drivers/ide/pdcraid.c2
-rw-r--r--drivers/md/md.c2
-rw-r--r--drivers/message/i2o/i2o_block.c2
-rw-r--r--drivers/mtd/ftl.c2
-rw-r--r--drivers/mtd/nftlcore.c2
-rw-r--r--drivers/s390/block/dasd.c4
-rw-r--r--drivers/sbus/char/jsflash.c2
-rw-r--r--drivers/scsi/sd.c2
-rw-r--r--include/linux/blkpg.h2
27 files changed, 29 insertions, 31 deletions
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 82fb82432ef5..b9dab9831a21 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -1222,7 +1222,7 @@ static int mfm_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long a
case BLKROSET:
case BLKROGET:
case BLKPG:
- return blk_ioctl(dev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 433531d63435..d205bf2c4a8d 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -5398,7 +5398,7 @@ static int DAC960_IOCTL(Inode_T *Inode, File_T *File,
case BLKFLSBUF:
case BLKBSZGET:
case BLKBSZSET:
- return blk_ioctl(Inode->i_rdev, Request, Argument);
+ return blk_ioctl(Inode->i_bdev, Request, Argument);
case BLKRRPART:
/* Re-Read Partition Table. */
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c
index 3721705e70e5..85224abc2bfe 100644
--- a/drivers/block/acsi.c
+++ b/drivers/block/acsi.c
@@ -1141,7 +1141,7 @@ static int acsi_ioctl( struct inode *inode, struct file *file,
case BLKROGET:
case BLKFLSBUF:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
case BLKRRPART: /* Re-read partition tables */
if (!capable(CAP_SYS_ADMIN))
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index bdc585c419ff..7f18fca76d08 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1574,7 +1574,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp,
case BLKROSET:
case BLKROGET:
case BLKFLSBUF:
- return blk_ioctl(device, cmd, param);
+ return blk_ioctl(inode->i_bdev, cmd, param);
}
drive = minor (device);
type = drive >> 2;
diff --git a/drivers/block/blkpg.c b/drivers/block/blkpg.c
index a1f9a13a749f..35d3cc33d0ee 100644
--- a/drivers/block/blkpg.c
+++ b/drivers/block/blkpg.c
@@ -200,16 +200,14 @@ int blkpg_ioctl(kdev_t dev, struct blkpg_ioctl_arg *arg)
* Common ioctl's for block devices
*/
extern int block_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg);
-int blk_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg)
+int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg)
{
request_queue_t *q;
struct gendisk *g;
u64 ullval = 0;
int intval;
unsigned short usval;
-
- if (kdev_none(dev))
- return -EINVAL;
+ kdev_t dev = to_kdev_t(bdev->bd_dev);
intval = block_ioctl(dev, cmd, arg);
if (intval != -ENOTTY)
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 47d9b0808280..d87635dd23ea 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -469,7 +469,7 @@ static int cciss_ioctl(struct inode *inode, struct file *filep,
case BLKROSET:
case BLKROGET:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
case CCISS_GETPCIINFO:
{
cciss_pci_info_struct pciinfo;
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 694a1efd4578..c8cf5871273b 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -1179,7 +1179,7 @@ static int ida_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
case BLKROSET:
case BLKROGET:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5359938e99e8..052d2a6b8f60 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3449,7 +3449,7 @@ static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
case BLKROSET:
case BLKROGET:
case BLKFLSBUF:
- return blk_ioctl(device, cmd, param);
+ return blk_ioctl(inode->i_bdev, cmd, param);
}
type = TYPE(device);
drive = DRIVE(device);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index eb1f8813b421..cfce7b234c57 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -852,7 +852,7 @@ static int lo_ioctl(struct inode * inode, struct file * file,
break;
case BLKBSZGET:
case BLKBSZSET:
- err = blk_ioctl(inode->i_rdev, cmd, arg);
+ err = blk_ioctl(inode->i_bdev, cmd, arg);
break;
default:
err = lo->ioctl ? lo->ioctl(lo, cmd, arg) : -EINVAL;
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 7d0f6a6a5f7a..91cc8e3eac35 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -481,7 +481,7 @@ static int pd_ioctl(struct inode *inode,struct file *file,
case BLKROGET:
case BLKFLSBUF:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
}
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 034705f2f1c1..be857543c111 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -433,7 +433,7 @@ static int pf_ioctl(struct inode *inode,struct file *file,
case BLKROSET:
case BLKROGET:
case BLKFLSBUF:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
}
diff --git a/drivers/block/ps2esdi.c b/drivers/block/ps2esdi.c
index 95493ea0f1fe..79370ff00905 100644
--- a/drivers/block/ps2esdi.c
+++ b/drivers/block/ps2esdi.c
@@ -1111,7 +1111,7 @@ static int ps2esdi_ioctl(struct inode *inode,
case BLKBSZGET:
case BLKBSZSET:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
}
return (-EINVAL);
}
diff --git a/drivers/block/rd.c b/drivers/block/rd.c
index 3edd33c306ce..f9cf01e79412 100644
--- a/drivers/block/rd.c
+++ b/drivers/block/rd.c
@@ -311,7 +311,7 @@ static int rd_ioctl(struct inode *inode, struct file *file, unsigned int cmd, un
case BLKROSET:
case BLKROGET:
case BLKSSZGET:
- error = blk_ioctl(inode->i_rdev, cmd, arg);
+ error = blk_ioctl(inode->i_bdev, cmd, arg);
};
out:
return error;
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 30d2e864add5..76e87ad39cfd 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -355,7 +355,7 @@ static int xd_ioctl (struct inode *inode,struct file *file,u_int cmd,u_long arg)
case BLKROSET:
case BLKROGET:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 319206d7e4bf..14107f29c363 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -1729,7 +1729,7 @@ int cdrom_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
case BLKROGET:
case BLKFLSBUF:
case BLKSSZGET:
- return blk_ioctl(ip->i_rdev, cmd, arg);
+ return blk_ioctl(ip->i_bdev, cmd, arg);
case CDROMSUBCHNL: {
struct cdrom_subchnl q;
u_char requested, back;
diff --git a/drivers/ide/hd.c b/drivers/ide/hd.c
index 71e1ffefd0c2..6c708f38ba20 100644
--- a/drivers/ide/hd.c
+++ b/drivers/ide/hd.c
@@ -654,7 +654,7 @@ static int hd_ioctl(struct inode * inode, struct file * file,
case BLKROGET:
case BLKFLSBUF:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/ide/hptraid.c b/drivers/ide/hptraid.c
index 9a61e5112846..88f8858143fc 100644
--- a/drivers/ide/hptraid.c
+++ b/drivers/ide/hptraid.c
@@ -126,7 +126,7 @@ static int hptraid_ioctl(struct inode *inode, struct file *file, unsigned int cm
case BLKROSET:
case BLKROGET:
case BLKSSZGET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index bed4ea6280ca..1b1626859f26 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -2842,7 +2842,7 @@ static int ide_ioctl (struct inode *inode, struct file *file,
case BLKELVSET:
case BLKBSZGET:
case BLKBSZSET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
/*
* uniform packet command handling
diff --git a/drivers/ide/pdcraid.c b/drivers/ide/pdcraid.c
index 93e65583cac3..cdb18724f39d 100644
--- a/drivers/ide/pdcraid.c
+++ b/drivers/ide/pdcraid.c
@@ -148,7 +148,7 @@ static int pdcraid_ioctl(struct inode *inode, struct file *file, unsigned int cm
case BLKROSET:
case BLKROGET:
case BLKSSZGET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
printk("Invalid ioctl \n");
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 3bbbc201f4ee..e8e227b7cd9c 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2625,7 +2625,7 @@ static int md_ioctl(struct inode *inode, struct file *file,
case BLKFLSBUF:
case BLKBSZGET:
case BLKBSZSET:
- err = blk_ioctl(dev, cmd, arg);
+ err = blk_ioctl(inode->i_bdev, cmd, arg);
goto abort;
default:;
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 243b962d66ab..c229b896d48a 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1105,7 +1105,7 @@ static int i2ob_ioctl(struct inode *inode, struct file *file,
case BLKROSET:
case BLKROGET:
case BLKPG:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
default:
return -EINVAL;
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index 8e6ce8dab20e..1fc63d360def 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1144,7 +1144,7 @@ static int ftl_ioctl(struct inode *inode, struct file *file,
case BLKROSET:
case BLKROGET:
case BLKFLSBUF:
- ret = blk_ioctl(inode->i_rdev, cmd, arg);
+ ret = blk_ioctl(inode->i_bdev, cmd, arg);
break;
default:
ret = -EINVAL;
diff --git a/drivers/mtd/nftlcore.c b/drivers/mtd/nftlcore.c
index 7b41b62ad37c..2b60ed1319e4 100644
--- a/drivers/mtd/nftlcore.c
+++ b/drivers/mtd/nftlcore.c
@@ -823,7 +823,7 @@ static int nftl_ioctl(struct inode * inode, struct file * file, unsigned int cmd
case BLKROSET:
case BLKROGET:
case BLKSSZGET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
#endif
default:
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e5ddb0565c5a..1f5259ff728c 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2477,7 +2477,7 @@ do_dasd_ioctl (struct inode *inp, /* unsigned */ int no, unsigned long data)
rc = -EFAULT;
} else {
if ( bsz >= device->sizes.bp_block )
- rc = blk_ioctl (inp->i_rdev, no, data);
+ rc = blk_ioctl (inp->i_bdev, no, data);
else
rc = -EINVAL;
}
@@ -2493,7 +2493,7 @@ do_dasd_ioctl (struct inode *inp, /* unsigned */ int no, unsigned long data)
case BLKPG:
case BLKELVGET:
case BLKELVSET:
- return blk_ioctl (inp->i_rdev, no, data);
+ return blk_ioctl (inp->i_bdev, no, data);
break;
default:{
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 05b38ff0dc9f..a31a89a85236 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -468,7 +468,7 @@ static int jsfd_ioctl(struct inode *inode, struct file *file,
case BLKROSET:
case BLKROGET:
case BLKSSZGET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
#endif
/* case BLKFLSBUF: */ /* Program, then read, what happens? Stale? */
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a2687c4bb82e..72f2e23fbf16 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -235,7 +235,7 @@ static int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd,
case BLKELVSET:
case BLKBSZGET:
case BLKBSZSET:
- return blk_ioctl(inode->i_rdev, cmd, arg);
+ return blk_ioctl(inode->i_bdev, cmd, arg);
case BLKRRPART: /* Re-read partition tables */
if (!capable(CAP_SYS_ADMIN))
diff --git a/include/linux/blkpg.h b/include/linux/blkpg.h
index 2a5e4fb82b90..f58b6328e2bd 100644
--- a/include/linux/blkpg.h
+++ b/include/linux/blkpg.h
@@ -57,7 +57,7 @@ struct blkpg_partition {
#ifdef __KERNEL__
extern char * partition_name(kdev_t dev);
-extern int blk_ioctl(kdev_t dev, unsigned int cmd, unsigned long arg);
+extern int blk_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long arg);
#endif /* __KERNEL__ */
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-13 06:38:01 +0000