[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20220715140259.205ef267@canb.auug.org.au>
Date: Fri, 15 Jul 2022 14:02:59 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Jens Axboe <axboe@...nel.dk>, Al Viro <viro@...iv.linux.org.uk>
Cc: "Jason A. Donenfeld" <Jason@...c4.com>,
Ming Lei <ming.lei@...hat.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the block tree
Hi all,
After merging the block tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/block/ublk_drv.c:951:19: error: 'no_llseek' undeclared here (not in a function); did you mean 'noop_llseek'?
951 | .llseek = no_llseek,
| ^~~~~~~~~
| noop_llseek
Caused by commit
71f28f3136af ("ublk_drv: add io_uring based userspace block driver")
interacting with commit
8804bffa93a1 ("fs: remove no_llseek")
from the vfs tree.
I have applied the following merge resolution patch:
From: Stephen Rothwell <sfr@...b.auug.org.au>
Date: Fri, 15 Jul 2022 13:59:09 +1000
Subject: [PATCH] fix up for "fs: remove no_llseek"
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
drivers/block/ublk_drv.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index f10c4319dc1f..52fd0af8a4f2 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -948,7 +948,6 @@ static const struct file_operations ublk_ch_fops = {
.owner = THIS_MODULE,
.open = ublk_ch_open,
.release = ublk_ch_release,
- .llseek = no_llseek,
.uring_cmd = ublk_ch_uring_cmd,
.mmap = ublk_ch_mmap,
};
--
2.35.1
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists