From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sage Weil <sage@newdream•net>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
majianpeng <majianpeng@gmail•com>, Zach Brown <zab@zabbo•net>,
Dave Kleikamp <dave.kleikamp@oracle•com>
Subject: linux-next: build failure after merge of the ceph tree
Date: Fri, 27 Sep 2013 11:31:00 +1000 [thread overview]
Message-ID: <20130927113100.5c261c61856e26da4cf8f949@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]
Hi Sage,
After merging the ceph tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/ceph/file.c: In function 'ceph_sync_direct_write':
fs/ceph/file.c:545:24: error: 'struct iov_iter' has no member named 'iov'
void __user *data = i.iov->iov_base + i.iov_offset;
^
fs/ceph/file.c:546:14: error: 'struct iov_iter' has no member named 'iov'
u64 len = i.iov->iov_len - i.iov_offset;
^
This also happened yesterday but was swamped by the other error (now fixed).
Caused by commit d4ce96db671b ("ceph: Implement writev/pwritev for sync
operation") interacting with commit f6794d33a5ec ("iov_iter: hide iovec
details behind ops function pointers") from the aio-direct tree.
I applied the following merge fix patch (but there may be a better
solution):
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 27 Sep 2013 11:28:05 +1000
Subject: [PATCH] ceph: fix up for iov_iter changes
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
fs/ceph/file.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 5cf034e..1216372 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -542,8 +542,8 @@ ceph_sync_direct_write(struct kiocb *iocb, const struct iovec *iov,
iov_iter_init(&i, iov, nr_segs, count, 0);
while (iov_iter_count(&i) > 0) {
- void __user *data = i.iov->iov_base + i.iov_offset;
- u64 len = i.iov->iov_len - i.iov_offset;
+ void __user *data = iov_iter_iovec(&i)->iov_base + i.iov_offset;
+ u64 len = iov_iter_iovec(&i)->iov_len - i.iov_offset;
page_align = (unsigned long)data & ~PAGE_MASK;
--
1.8.4.rc3
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-09-27 1:31 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-27 1:31 Stephen Rothwell [this message]
2013-09-27 2:36 ` linux-next: build failure after merge of the ceph tree Dave Kleikamp
-- strict thread matches above, loose matches on Subject: below --
2020-12-14 23:46 Stephen Rothwell
2013-09-26 1:15 Stephen Rothwell
2013-09-26 1:20 ` majianpeng
2013-09-26 1:26 ` Sage Weil
2012-03-21 1:40 Stephen Rothwell
2012-03-21 4:24 ` Alex Elder
2010-11-16 23:43 Stephen Rothwell
2010-11-17 0:02 ` Sage Weil
2010-09-20 1:41 Stephen Rothwell
2010-09-20 2:53 ` Sage Weil
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=20130927113100.5c261c61856e26da4cf8f949@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dave.kleikamp@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=majianpeng@gmail$(echo .)com \
--cc=sage@newdream$(echo .)net \
--cc=zab@zabbo$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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