reserve BLKGETSIZE64 ioctl
Subsystems (10)
From [email protected] Tue Sep 4 22:54:05 2001
On Tue, 4 Sep 2001 [email protected] wrote:
> Then I am happy (as long as you don't take a reserved number).
So the patch below is okay?
Roughly speaking, yes.
(But why do you insist on using 110?
I wrote "A jump here: 108-111 have been used" because that is what I recall: three groups using 108-109 and one shifting to 110-111. I have no details, so may misremember, but still..)
Andries
Quoted 3 lines · On Tue, 4 Sep 2001 [email protected] wrote:
Roughly speaking, yes.
(But why do you insist on using 110?
That was what I'd changed to after the 108-109 conflict.
Quoted 3 lines
I wrote "A jump here: 108-111 have been used" because that is what I recall: three groups using 108-109 and one shifting to 110-111. I have no details, so may misremember, but still..)
In case it wasn't me, here it is again using 114. I hope I never have to diff this patch again.
-ben
drivers/acorn/block/mfmhd.c +2 -0
@@ -1210,6 +1210,8 @@case BLKGETSIZE :return put_user (mfm[minor].nr_sects, (long *)arg); +case BLKGETSIZE64 : +return put_user ((u64 )mfm[minor].nr_sects <<9 , (u64 *)arg);case BLKFRASET :if (!capable (CAP_SYS_ADMIN ))
drivers/block/DAC960.c +3 -1
@@ -5090,10 +5090,12 @@ sizeof(DiskGeometry_T)) ? -EFAULT : 0);case BLKGETSIZE :/* Get Device Size. */ -if ((long *) Argument ==NULL )return -EINVAL ;return put_user (Controller->GenericDiskInfo.part[MINOR (Inode->i_rdev)] .nr_sects, (long *) Argument); +case BLKGETSIZE64 : +return put_user ((u64 )Controller->GenericDiskInfo.part[MINOR (Inode->i_rdev)].nr_sects <<9 , + (u64 *) Argument);case BLKRAGET :case BLKRASET :case BLKFLSBUF :
drivers/block/acsi.c +4 -0
@@ -1138,6 +1138,10 @@return put_user (acsi_part[MINOR (inode->i_rdev)].nr_sects, (long *) arg); +case BLKGETSIZE64 :/* Return device size */ +return put_user ((u64 )acsi_part[MINOR (inode->i_rdev)].nr_sects <<9 , + (u64 *) arg); +case BLKROSET :case BLKROGET :case BLKFLSBUF :
drivers/block/amiflop.c +3 -0
@@ -1556,6 +1556,9 @@case BLKGETSIZE :return put_user (unit[drive].blocks,(long *)param);break ; +case BLKGETSIZE64 : +return put_user ((u64 )unit[drive].blocks <<9 , (u64 *)param); +break ;case FDSETPRM :case FDDEFPRM :return -EINVAL ;
drivers/block/blkpg.c +1 -0
@@ -250,6 +250,7 @@case BLKGETSIZE :/* Today get_gendisk() requires a linear scan; add this when dev has pointer type. */ +/* add BLKGETSIZE64 too */ g =get_gendisk (dev);if (!g) longval =0 ;
drivers/block/cciss.c +3 -1
@@ -400,8 +400,10 @@put_user (hba[ctlr]->hd[MINOR (inode->i_rdev)].start_sect, &geo->start);return 0 ;case BLKGETSIZE : -if (!arg)return -EINVAL ;put_user (hba[ctlr]->hd[MINOR (inode->i_rdev)].nr_sects, (long *)arg); +return 0 ; +case BLKGETSIZE64 : +put_user ((u64 )hba[ctlr]->hd[MINOR (inode->i_rdev)].nr_sects <<9 , (u64 *)arg);return 0 ;case BLKRRPART :return revalidate_logvol (inode->i_rdev,1 );
drivers/block/cpqarray.c +3 -3
@@ -1227,9 +1227,9 @@case IDAGETDRVINFO :return copy_to_user (&io->c.drv,&hba[ctlr]->drv[dsk],sizeof (drv_info_t));case BLKGETSIZE : -if (!arg)return -EINVAL ; -put_user (ida[(ctlr<<CTLR_SHIFT )+MINOR (inode->i_rdev)].nr_sects, (long *)arg); -return 0 ; +return put_user (ida[(ctlr<<CTLR_SHIFT )+MINOR (inode->i_rdev)].nr_sects, (long *)arg); +case BLKGETSIZE64 : +return put_user ((u64)(ida[(ctlr<<CTLR_SHIFT )+MINOR (inode->i_rdev)].nr_sects) <<9 , (u64 *)arg);case BLKRRPART :return revalidate_logvol (inode->i_rdev,1 );case IDAPASSTHRU :
drivers/block/floppy.c +4 -0
@@ -3492,6 +3492,10 @@case BLKGETSIZE :ECALL (get_floppy_geometry (drive, type, &g));return put_user (g->size, (long *) param); + +case BLKGETSIZE64 : +ECALL (get_floppy_geometry (drive, type, &g)); +return put_user ((u64 )g->size <<9 , (u64 *) param);/* BLKRRPART is not defined as floppies don't have * partition tables */ }
drivers/block/loop.c +6 -3
@@ -849,11 +849,14 @@ err = -ENXIO ;break ; } -if (!arg) { - err = -EINVAL ; + err =put_user (loop_sizes[lo->lo_number] <<1 , (long *) arg); +break ; +case BLKGETSIZE64 : +if (lo->lo_state != Lo_bound) { + err = -ENXIO ;break ; } - err =put_user (loop_sizes[lo->lo_number] <<1 , (long *) arg); + err =put_user ((u64 )loop_sizes[lo->lo_number] <<10 , (u64 *)arg);break ;case BLKBSZGET :case BLKBSZSET :
drivers/block/nbd.c +2 -0
@@ -446,6 +446,8 @@#endif case BLKGETSIZE :return put_user (nbd_bytesizes[dev] >>9 , (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )nbd_bytesizes[dev], (u64 *) arg); }return -EINVAL ; }
drivers/block/paride/pd.c +2 -0
@@ -535,6 +535,8 @@if (err)return (err);put_user (pd_hd[dev].nr_sects,(long *) arg);return (0 ); +case BLKGETSIZE64 : +return put_user ((u64 )pd_hd[dev].nr_sects <<9 , (u64 *)arg);case BLKRRPART :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
drivers/block/paride/pf.c +3 -5
@@ -482,11 +482,9 @@put_user (0 ,(long *)&geo->start);return 0 ;case BLKGETSIZE : -if (!arg)return -EINVAL ; - err =verify_area (VERIFY_WRITE ,(long *) arg,sizeof (long )); -if (err)return (err); -put_user (PF .capacity,(long *) arg); -return (0 ); +return put_user (PF .capacity,(long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )PF .capacity <<9 ,(u64 *)arg);case BLKROSET :case BLKROGET :case BLKRASET :
drivers/block/ps2esdi.c +3 -0
@@ -1117,6 +1117,9 @@ }break ; +case BLKGETSIZE64 : +return put_user ((u64 )ps2esdi[MINOR (inode->i_rdev)].nr_sects <<9 , (u64 *) arg); +case BLKRRPART :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
drivers/block/rd.c +3 -0
@@ -269,6 +269,9 @@if (!arg)return -EINVAL ;return put_user (rd_kbsize[minor] <<1 , (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )rd_kbsize[minor] <<10 , (u64 *)arg); +case BLKROSET :case BLKROGET :case BLKSSZGET :
drivers/block/xd.c +2 -0
@@ -339,6 +339,8 @@case BLKGETSIZE :if (!arg)return -EINVAL ;return put_user (xd_struct[MINOR (inode->i_rdev)].nr_sects,(long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )xd_struct[MINOR (inode->i_rdev)].nr_sects <<9 , (u64 *)arg);case HDIO_SET_DMA :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;if (xdc_busy)return -EBUSY ;
drivers/i2o/i2o_block.c +2 -0
@@ -1141,6 +1141,8 @@switch (cmd) {case BLKGETSIZE :return put_user (i2ob[minor].nr_sects, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )i2ob[minor].nr_sects <<9 , (u64 *)arg);case HDIO_GETGEO : {
drivers/ide/hd.c +3 -1
@@ -639,9 +639,11 @@ }case BLKGETSIZE :/* Return device size */ -if (!arg)return -EINVAL ;return put_user (hd[MINOR (inode->i_rdev)].nr_sects, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )hd[MINOR (inode->i_rdev)].nr_sects <<9 , + (u64 *) arg);case BLKRRPART :/* Re-read partition tables */ if (!capable (CAP_SYS_ADMIN ))
drivers/ide/ide.c +2 -0
@@ -2663,6 +2663,8 @@case BLKGETSIZE :/* Return device size */ return put_user (drive->part[MINOR (inode->i_rdev)&PARTN_MASK ].nr_sects, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )drive->part[MINOR (inode->i_rdev)&PARTN_MASK ].nr_sects <<9 , (u64 *) arg);case BLKRRPART :/* Re-read partition tables */ if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
drivers/md/lvm.c +5 -0
@@ -906,6 +906,11 @@return -EFAULT ;break ; +case BLKGETSIZE64 : +if (put_user ((u64 )lv_ptr->lv_size <<9 , (u64 *)arg)) +return -EFAULT ; +break ; +case BLKFLSBUF :/* flush buffer cache */
drivers/md/md.c +5 -0
@@ -2490,6 +2490,11 @@ (long *) arg); goto done; +case BLKGETSIZE64 :/* Return device size */ + err =md_put_user ((u64 )md_hd_struct[minor].nr_sects <<9 , + (u64 *) arg); + goto done; +case BLKRAGET :case BLKRASET :case BLKFLSBUF :
drivers/mtd/ftl.c +4 -4
@@ -1174,10 +1174,10 @@put_user (ftl_hd[minor].start_sect, (u_long *)&geo->start);break ;case BLKGETSIZE : - ret =verify_area (VERIFY_WRITE , (long *)arg,sizeof (long )); -if (ret)return ret; -put_user (ftl_hd[minor].nr_sects, - (long *)arg); + ret =put_user (ftl_hd[minor].nr_sects, (long *)arg); +break ; +case BLKGETSIZE64 : + ret =put_user ((u64 )ftl_hd[minor].nr_sects <<9 , (u64 *)arg);break ;case BLKRRPART : ret =ftl_reread_partitions (minor);
drivers/mtd/mtdblock.c +3 -4
@@ -529,10 +529,9 @@switch (cmd) {case BLKGETSIZE :/* Return device size */ -if (!arg) -return -EFAULT ; -return put_user ((mtdblk->mtd->size >>9 ), - (long *) arg)?-EFAULT :0 ; +return put_user ((mtdblk->mtd->size >>9 ), (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )mtdblk->mtd->size, (u64 *)arg);case BLKFLSBUF :#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,2 ,0 )
drivers/mtd/mtdblock_ro.c +3 -3
@@ -211,9 +211,9 @@switch (cmd) {case BLKGETSIZE :/* Return device size */ -if (!arg)return -EFAULT ; -return Put_user ((mtd->size >>9 ), - (long *) arg); +return put_user ((mtd->size >>9 ), (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )mtd->size, (u64 *)arg);case BLKFLSBUF :#if LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,2 ,0 )
drivers/mtd/nftlcore.c +3 -1
@@ -791,9 +791,11 @@return copy_to_user ((void *)arg, &g,sizeof g) ? -EFAULT :0 ; }case BLKGETSIZE :/* Return device size */ -if (!arg)return -EINVAL ;return put_user (part_table[MINOR (inode->i_rdev)].nr_sects, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )part_table[MINOR (inode->i_rdev)].nr_sects <<9 , + (u64 *)arg);case BLKFLSBUF :if (!capable (CAP_SYS_ADMIN ))return -EACCES ;
drivers/s390/block/dasd.c +7 -5
@@ -2189,11 +2189,13 @@case BLKGETSIZE :{/* Return device size */ long blocks = major_info->gendisk.sizes [MINOR (inp->i_rdev)] <<1 ; - rc = -copy_to_user ((long *) data, &blocks, -sizeof (long )); -if (rc) - rc = -EFAULT ; + rc =put_user (blocks, (long *)arg); +break ; + } +case BLKGETSIZE64 :{ +u64 blocks = major_info->gendisk.sizes + [MINOR (inp->i_rdev)]; + rc =put_user (blocks <<10 , (u64 *)arg);break ; }case BLKRRPART :{
drivers/s390/block/xpram.c +6 -6
@@ -647,14 +647,14 @@case BLKGETSIZE :/* 0x1260 */ /* Return the device size, expressed in sectors */ -if (!arg)return -EINVAL ;/* NULL pointer: not valid */ - err=0 ;/* verify_area_20(VERIFY_WRITE, (long *) arg, sizeof(long)); -* if (err) return err; -*/ -put_user (1024 * xpram_sizes[MINOR (inode->i_rdev)] +return put_user (1024 * xpram_sizes[MINOR (inode->i_rdev)] /XPRAM_SOFTSECT , (long *) arg); -return 0 ; + +case BLKGETSIZE64 : +return put_user ( (u64)(1024 * xpram_sizes[MINOR (inode->i_rdev)] + /XPRAM_SOFTSECT ) <<9 , + (u64 *) arg);case BLKFLSBUF :/* flush, 0x1261 */ fsync_dev (inode->i_rdev);
drivers/sbus/char/jsflash.c +2 -0
@@ -454,6 +454,8 @@switch (cmd) {case BLKGETSIZE :return put_user (jsfd_bytesizes[dev] >>9 , (long *) arg); +case BLKGETSIZE64 : +return put_user (jsfd_bytesizes[dev], (u64 *) arg);#if 0 case BLKROSET :
drivers/scsi/sd.c +2 -2
@@ -227,9 +227,9 @@return 0 ; }case BLKGETSIZE :/* Return device size */ -if (!arg) -return -EINVAL ;return put_user (sd[SD_PARTITION (inode->i_rdev)].nr_sects, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )sd[SD_PARTITION (inode->i_rdev)].nr_sects <<9 , (u64 *)arg);case BLKROSET :case BLKROGET :
drivers/scsi/sr_ioctl.c +2 -0
@@ -546,6 +546,8 @@switch (cmd) {case BLKGETSIZE :return put_user (scsi_CDs[target].capacity, (long *) arg); +case BLKGETSIZE64 : +return put_user ((u64 )scsi_CDs[target].capacity <<9 , (u64 *)arg);case BLKROSET :case BLKROGET :case BLKRASET :
include/asm-i386/uaccess.h +8 -0
@@ -126,6 +126,7 @@extern void __put_user_1 (void );extern void __put_user_2 (void );extern void __put_user_4 (void ); +extern void __put_user_8 (void );extern void __put_user_bad (void );
@@ -161,6 +162,13 @@case 1 :__put_user_asm (x,ptr,retval,"b" ,"b" ,"iq" );break ; \case 2 :__put_user_asm (x,ptr,retval,"w" ,"w" ,"ir" );break ; \case 4 :__put_user_asm (x,ptr,retval,"l" ,"" ,"ir" );break ; \ +case 8 : { \ +u32 *__put_ptr = (void *)(ptr); \ +u64 __put_val = (x); \ +__put_user_asm ((u32 )__put_val,__put_ptr,retval,"l" ,"" ,"ir" ); \ +__put_user_asm ((u32)(__put_val>>32 ),__put_ptr+1 ,retval,"l" ,"" ,"ir" ); \ +break ; \ + } \default :__put_user_bad (); \ } \ }while (0 )
include/linux/fs.h +2 -1
@@ -166,7 +166,7 @@#define BLKROSET _IO(0x12,93)/* set device read-only (0 = read-write) */ #define BLKROGET _IO(0x12,94)/* get read-only status (0 = read_write) */ #define BLKRRPART _IO(0x12,95)/* re-read partition table */ -#define BLKGETSIZE _IO(0x12,96)/* return device size */ +#define BLKGETSIZE _IO(0x12,96)/* return device size /512 (long *arg) */ #define BLKFLSBUF _IO(0x12,97)/* flush buffer cache */ #define BLKRASET _IO(0x12,98)/* Set read ahead for block device */ #define BLKRAGET _IO(0x12,99)/* get current read ahead setting */
@@ -185,6 +185,7 @@/* A jump here: 108-111 have been used for various private purposes. */ #define BLKBSZGET _IOR(0x12,112,sizeof(int))#define BLKBSZSET _IOW(0x12,113,sizeof(int)) +#define BLKGETSIZE64 _IOR(0x12,114,sizeof(u64))/* return device size in bytes (u64 *arg) */ #define BMAP_IOCTL 1/* obsolete - kept for compatibility */ #define FIBMAP _IO(0x00,1)/* bmap access */