From: Stephen Rothwell <sfr@canb.auug.org.au> To: Ben Myers <bpm@sgi.com>, David Chinner <david@fromorbit.com>, xfs@oss.sgi.com Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Omar Sandoval <osandov@osandov.com>, Al Viro <viro@zeniv.linux.org.uk> Subject: linux-next: build failure after merge of the xfs tree Date: Mon, 20 Apr 2015 12:35:24 +1000 [thread overview] Message-ID: <20150420123524.4d1da1fa@canb.auug.org.au> (raw) [-- Attachment #1: Type: text/plain, Size: 2069 bytes --] Hi all, After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/xfs/xfs_file.c: In function 'xfs_file_dio_aio_write': fs/xfs/xfs_file.c:744:8: warning: passing argument 1 of 'mapping->a_ops->direct_IO' makes pointer from integer without a cast ret = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos); ^ fs/xfs/xfs_file.c:744:8: note: expected 'struct kiocb *' but argument is of type 'long long unsigned int' fs/xfs/xfs_file.c:744:8: warning: passing argument 2 of 'mapping->a_ops->direct_IO' from incompatible pointer type fs/xfs/xfs_file.c:744:8: note: expected 'struct iov_iter *' but argument is of type 'struct kiocb *' fs/xfs/xfs_file.c:744:8: warning: passing argument 3 of 'mapping->a_ops->direct_IO' makes integer from pointer without a cast fs/xfs/xfs_file.c:744:8: note: expected 'loff_t' but argument is of type 'struct iov_iter *' fs/xfs/xfs_file.c:744:8: error: too many arguments to function 'mapping->a_ops->direct_IO' So, my merge resolution was not sufficient :-( Commit 22c6186ecea0 ("direct_IO: remove rw from a_ops->direct_IO()") removed the first argument from ->direct_IO(), so I added the following merge fix patch. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 20 Apr 2015 12:32:00 +1000 Subject: [PATCH] xfs: fix up for direct_IO API change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- fs/xfs/xfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 0d5053fcd8c5..8121e75352ee 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -741,7 +741,7 @@ xfs_file_dio_aio_write( trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0); data = *from; - ret = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos); + ret = mapping->a_ops->direct_IO(iocb, &data, pos); /* see generic_file_direct_write() for why this is necessary */ if (mapping->nrpages) { -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au> To: Ben Myers <bpm@sgi.com>, David Chinner <david@fromorbit.com>, xfs@oss.sgi.com Cc: Omar Sandoval <osandov@osandov.com>, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk> Subject: linux-next: build failure after merge of the xfs tree Date: Mon, 20 Apr 2015 12:35:24 +1000 [thread overview] Message-ID: <20150420123524.4d1da1fa@canb.auug.org.au> (raw) [-- Attachment #1.1: Type: text/plain, Size: 2069 bytes --] Hi all, After merging the xfs tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: fs/xfs/xfs_file.c: In function 'xfs_file_dio_aio_write': fs/xfs/xfs_file.c:744:8: warning: passing argument 1 of 'mapping->a_ops->direct_IO' makes pointer from integer without a cast ret = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos); ^ fs/xfs/xfs_file.c:744:8: note: expected 'struct kiocb *' but argument is of type 'long long unsigned int' fs/xfs/xfs_file.c:744:8: warning: passing argument 2 of 'mapping->a_ops->direct_IO' from incompatible pointer type fs/xfs/xfs_file.c:744:8: note: expected 'struct iov_iter *' but argument is of type 'struct kiocb *' fs/xfs/xfs_file.c:744:8: warning: passing argument 3 of 'mapping->a_ops->direct_IO' makes integer from pointer without a cast fs/xfs/xfs_file.c:744:8: note: expected 'loff_t' but argument is of type 'struct iov_iter *' fs/xfs/xfs_file.c:744:8: error: too many arguments to function 'mapping->a_ops->direct_IO' So, my merge resolution was not sufficient :-( Commit 22c6186ecea0 ("direct_IO: remove rw from a_ops->direct_IO()") removed the first argument from ->direct_IO(), so I added the following merge fix patch. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 20 Apr 2015 12:32:00 +1000 Subject: [PATCH] xfs: fix up for direct_IO API change Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- fs/xfs/xfs_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index 0d5053fcd8c5..8121e75352ee 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -741,7 +741,7 @@ xfs_file_dio_aio_write( trace_xfs_file_direct_write(ip, count, iocb->ki_pos, 0); data = *from; - ret = mapping->a_ops->direct_IO(WRITE, iocb, &data, pos); + ret = mapping->a_ops->direct_IO(iocb, &data, pos); /* see generic_file_direct_write() for why this is necessary */ if (mapping->nrpages) { -- 2.1.4 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [-- Attachment #1.2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] [-- Attachment #2: Type: text/plain, Size: 121 bytes --] _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2015-04-20 2:35 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-04-20 2:35 Stephen Rothwell [this message] 2015-04-20 2:35 ` linux-next: build failure after merge of the xfs tree Stephen Rothwell -- strict thread matches above, loose matches on Subject: below -- 2020-07-07 0:27 Stephen Rothwell 2019-10-28 23:11 Stephen Rothwell 2019-10-28 23:18 ` Darrick J. Wong 2019-10-29 5:56 ` Christoph Hellwig 2019-10-29 6:23 ` Stephen Rothwell 2019-10-29 6:32 ` Christoph Hellwig 2019-07-01 1:12 Stephen Rothwell 2016-02-09 0:17 Stephen Rothwell 2016-02-09 0:17 ` Stephen Rothwell 2016-02-09 0:30 ` Eric Sandeen 2016-02-09 0:30 ` Eric Sandeen 2016-02-09 0:41 ` Stephen Rothwell 2016-02-09 0:41 ` Stephen Rothwell 2013-04-29 1:29 Stephen Rothwell 2013-04-29 1:29 ` Stephen Rothwell 2013-04-29 1:40 ` Dave Chinner 2013-04-29 1:40 ` Dave Chinner 2013-04-30 18:36 ` Ben Myers 2013-04-30 18:36 ` Ben Myers 2012-05-10 3:01 Stephen Rothwell 2012-05-10 3:01 ` Stephen Rothwell 2012-05-10 18:32 ` Ben Myers 2012-05-10 18:32 ` Ben Myers 2012-05-10 18:36 ` Mark Tinguely 2012-05-10 18:36 ` Mark Tinguely 2012-05-10 18:43 ` Ben Myers 2012-05-10 18:43 ` Ben Myers 2010-10-08 0:08 Stephen Rothwell 2010-07-26 1:51 Stephen Rothwell 2010-07-26 3:54 ` Dave Chinner 2010-07-26 4:28 ` 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=20150420123524.4d1da1fa@canb.auug.org.au \ --to=sfr@canb.auug.org.au \ --cc=bpm@sgi.com \ --cc=david@fromorbit.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-next@vger.kernel.org \ --cc=osandov@osandov.com \ --cc=viro@zeniv.linux.org.uk \ --cc=xfs@oss.sgi.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.