From: Arnd Bergmann <arnd@arndb.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Christoph Hellwig <hch@lst.de>
Subject: Re: linux-next: manual merge of the y2038 tree with the vhost tree
Date: Mon, 6 Jan 2020 09:31:14 +0100 [thread overview]
Message-ID: <CAK8P3a2ackxPwQxb-yeQ1pgJ5Hbh44NXDUCSfROc94kmmtx89A@mail.gmail.com> (raw)
In-Reply-To: <20200106152440.05a36767@canb.auug.org.au>
On Mon, Jan 6, 2020 at 5:24 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the y2038 tree got a conflict in:
>
> drivers/block/virtio_blk.c
>
> between commit:
>
> d1281e3a562e ("virtio-blk: remove VIRTIO_BLK_F_SCSI support")
>
> from the vhost tree and commit:
>
> d320a9551e39 ("compat_ioctl: scsi: move ioctl handling into drivers")
>
> from the y2038 tree.
>
> I wonder if this driver needs a compat_ioctl entry at all any more?
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.
Arnd
next prev parent reply other threads:[~2020-01-06 8:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 4:24 linux-next: manual merge of the y2038 tree with the vhost tree Stephen Rothwell
2020-01-06 8:31 ` Arnd Bergmann [this message]
2020-01-06 9:25 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK8P3a2ackxPwQxb-yeQ1pgJ5Hbh44NXDUCSfROc94kmmtx89A@mail.gmail.com \
--to=arnd@arndb.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).