Re: kill VNDIOCGET60

2019-11-18 Thread Theo de Raadt
Jeremie Courreges-Anglas  wrote:

> On Mon, Nov 18 2019, Benjamin Baier  wrote:
> > Hi, found this.
> 
> No idea why I commented this out instead of just deleting it.  We're not
> keeping old ioctls in other places.  Committed, thanks.

yes, that was a weird style.



Re: kill VNDIOCGET60

2019-11-18 Thread Jeremie Courreges-Anglas
On Mon, Nov 18 2019, Benjamin Baier  wrote:
> Hi, found this.

No idea why I commented this out instead of just deleting it.  We're not
keeping old ioctls in other places.  Committed, thanks.

>  -- Ben
>
> Index: vndioctl.h
> ===
> RCS file: /cvs/src/sys/dev/vndioctl.h,v
> retrieving revision 1.10
> diff -u -p -r1.10 vndioctl.h
> --- vndioctl.h14 Dec 2016 18:59:12 -  1.10
> +++ vndioctl.h18 Nov 2019 20:11:50 -
> @@ -75,8 +75,6 @@ struct vnd_user {
>   */
>  #define VNDIOCSET_IOWR('F', 0, struct vnd_ioctl) /* enable disk */
>  #define VNDIOCCLR_IOW('F', 1, struct vnd_ioctl)  /* disable disk */
> -/* XXX kill after 6.1 */
> -/* #define VNDIOCGET60   _IOWR('F', 2, struct vnd_user60) */
>  #define VNDIOCGET_IOWR('F', 3, struct vnd_user)  /* get disk info */
>  
>  #endif /* !_SYS_VNDIOCTL_H_ */
>

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



kill VNDIOCGET60

2019-11-18 Thread Benjamin Baier
Hi, found this.

 -- Ben

Index: vndioctl.h
===
RCS file: /cvs/src/sys/dev/vndioctl.h,v
retrieving revision 1.10
diff -u -p -r1.10 vndioctl.h
--- vndioctl.h  14 Dec 2016 18:59:12 -  1.10
+++ vndioctl.h  18 Nov 2019 20:11:50 -
@@ -75,8 +75,6 @@ struct vnd_user {
  */
 #define VNDIOCSET  _IOWR('F', 0, struct vnd_ioctl) /* enable disk */
 #define VNDIOCCLR  _IOW('F', 1, struct vnd_ioctl)  /* disable disk */
-/* XXX kill after 6.1 */
-/* #define VNDIOCGET60 _IOWR('F', 2, struct vnd_user60) */
 #define VNDIOCGET  _IOWR('F', 3, struct vnd_user)  /* get disk info */
 
 #endif /* !_SYS_VNDIOCTL_H_ */