Re: linux-next: manual merge of the y2038 tree with the vhost tree

[Stephen Rothwell]

Hi Arnd,

On Mon, 6 Jan 2020 09:31:14 +0100 Arnd Bergmann <arnd@xxxxxxxx> wrote:
>
> It doesn't. The rules used to be fairly complicated, but not
> (after my patches) basically any driver that has an .ioctl
> function must have a .compat_ioctl function and vice versa.
> 
> > index 54158766334b,fbbf18ac1d5d..000000000000
> > --- a/drivers/block/virtio_blk.c
> > +++ b/drivers/block/virtio_blk.c
> > @@@ -310,6 -404,10 +310,9 @@@ static int virtblk_getgeo(struct block_
> >   }
> >
> >   static const struct block_device_operations virtblk_fops = {
> >  -      .ioctl  = virtblk_ioctl,
> > + #ifdef CONFIG_COMPAT
> > +       .compat_ioctl = blkdev_compat_ptr_ioctl,
> > + #endif
> >         .owner  = THIS_MODULE,
> >         .getgeo = virtblk_getgeo,
> >   };  
> 
> Removing it would be better, but this version is not wrong.

Thanks.

I have adjusted my resolution from tomorrow to drop the CONFIG_COMPAT
section as well.

-- 
Cheers,
Stephen Rothwell

Attachment: pgp9RXJ_hc8vX.pgp
Description: OpenPGP digital signature