Message ID | 20210315200242.67355-3-mcroce@linux.microsoft.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | block: add a sequence number to disks | expand |
On Mon, Mar 15, 2021 at 09:02:39PM +0100, Matteo Croce wrote: > +++ b/include/uapi/linux/fs.h > @@ -184,6 +184,7 @@ struct fsxattr { > #define BLKSECDISCARD _IO(0x12,125) > #define BLKROTATIONAL _IO(0x12,126) > #define BLKZEROOUT _IO(0x12,127) > +#define BLKGETDISKSEQ _IOR(0x12,128,__u64) > /* > * A jump here: 130-131 are reserved for zoned block devices > * (see uapi/linux/blkzoned.h) Not your bug, but this is now 130-136. +cc all the people who signed off on the commits that added those ioctl numbers without updating this comment. Perhaps one of them will figure out how to stop this happening in future.
On 2021/03/16 5:14, Matthew Wilcox wrote: > On Mon, Mar 15, 2021 at 09:02:39PM +0100, Matteo Croce wrote: >> +++ b/include/uapi/linux/fs.h >> @@ -184,6 +184,7 @@ struct fsxattr { >> #define BLKSECDISCARD _IO(0x12,125) >> #define BLKROTATIONAL _IO(0x12,126) >> #define BLKZEROOUT _IO(0x12,127) >> +#define BLKGETDISKSEQ _IOR(0x12,128,__u64) >> /* >> * A jump here: 130-131 are reserved for zoned block devices >> * (see uapi/linux/blkzoned.h) > > Not your bug, but this is now 130-136. > > +cc all the people who signed off on the commits that added those ioctl > numbers without updating this comment. Perhaps one of them will figure > out how to stop this happening in future. > Indeed. Will be more careful :) And send a patch to fix this. Thanks !
On Mon, Mar 15, 2021 at 9:13 PM Matthew Wilcox <willy@infradead.org> wrote: > > On Mon, Mar 15, 2021 at 09:02:39PM +0100, Matteo Croce wrote: > > +++ b/include/uapi/linux/fs.h > > @@ -184,6 +184,7 @@ struct fsxattr { > > #define BLKSECDISCARD _IO(0x12,125) > > #define BLKROTATIONAL _IO(0x12,126) > > #define BLKZEROOUT _IO(0x12,127) > > +#define BLKGETDISKSEQ _IOR(0x12,128,__u64) > > /* > > * A jump here: 130-131 are reserved for zoned block devices > > * (see uapi/linux/blkzoned.h) > > Not your bug, but this is now 130-136. > > +cc all the people who signed off on the commits that added those ioctl > numbers without updating this comment. Perhaps one of them will figure > out how to stop this happening in future. Note taken, thanks!
diff --git a/block/ioctl.c b/block/ioctl.c index ff241e663c01..266315d00942 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -467,6 +467,8 @@ static int blkdev_common_ioctl(struct block_device *bdev, fmode_t mode, BLKDEV_DISCARD_SECURE); case BLKZEROOUT: return blk_ioctl_zeroout(bdev, mode, arg); + case BLKGETDISKSEQ: + return put_u64(argp, bdev->bd_disk->diskseq); case BLKREPORTZONE: return blkdev_report_zones_ioctl(bdev, mode, cmd, arg); case BLKRESETZONE: diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index f44eb0a04afd..5dc72bbdd9b7 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -184,6 +184,7 @@ struct fsxattr { #define BLKSECDISCARD _IO(0x12,125) #define BLKROTATIONAL _IO(0x12,126) #define BLKZEROOUT _IO(0x12,127) +#define BLKGETDISKSEQ _IOR(0x12,128,__u64) /* * A jump here: 130-131 are reserved for zoned block devices * (see uapi/linux/blkzoned.h)