From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dan Williams <dan.j.williams@intel.com>, Gao Xiang <xiang@kernel.org>
Cc: Gao Xiang <hsiangkao@linux.alibaba.com>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the nvdimm tree
Date: Mon, 30 Aug 2021 17:09:38 +1000 [thread overview]
Message-ID: <20210830170938.6fd8813d@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2084 bytes --]
Hi all,
After merging the nvdimm tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/erofs/super.c: In function 'erofs_fc_fill_super':
fs/erofs/super.c:549:7: error: implicit declaration of function 'bdev_dax_supported'; did you mean 'dax_supported'? [-Werror=implicit-function-declaration]
549 | !bdev_dax_supported(sb->s_bdev, EROFS_BLKSIZ)) {
| ^~~~~~~~~~~~~~~~~~
| dax_supported
Caused by commit
bdd3c50d83bf ("dax: remove bdev_dax_supported")
Interacting with commit
06252e9ce05b ("erofs: dax support for non-tailpacking regular file")
from the erofs tree.
I have applied the following merge fix patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 30 Aug 2021 17:04:59 +1000
Subject: [PATCH] fixup for "dax: remove bdev_dax_supported"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/erofs/super.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/erofs/super.c b/fs/erofs/super.c
index a8d49e8fc83a..2dc0b9f1d421 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -526,6 +526,7 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
struct inode *inode;
struct erofs_sb_info *sbi;
struct erofs_fs_context *ctx = fc->fs_private;
+ struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
int err;
sb->s_magic = EROFS_SUPER_MAGIC;
@@ -540,13 +541,14 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc)
return -ENOMEM;
sb->s_fs_info = sbi;
- sbi->dax_dev = fs_dax_get_by_bdev(sb->s_bdev);
+ sbi->dax_dev = dax_dev;
err = erofs_read_superblock(sb);
if (err)
return err;
if (test_opt(ctx, DAX_ALWAYS) &&
- !bdev_dax_supported(sb->s_bdev, EROFS_BLKSIZ)) {
+ !dax_supported(dax_dev, sb->s_bdev, EROFS_BLKSIZ, 0,
+ bdev_nr_sectors(sb->s_bdev))) {
errorfc(fc, "DAX unsupported by block device. Turning off DAX.");
clear_opt(ctx, DAX_ALWAYS);
}
--
2.32.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-08-30 7:09 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-30 7:09 Stephen Rothwell [this message]
2021-08-30 7:10 ` linux-next: build failure after merge of the nvdimm tree Christoph Hellwig
2021-08-30 7:15 ` Gao Xiang
-- strict thread matches above, loose matches on Subject: below --
2022-05-16 9:10 Stephen Rothwell
2022-05-16 18:05 ` Dan Williams
2019-07-05 7:20 Stephen Rothwell
2019-07-05 8:45 ` Pankaj Gupta
2019-07-05 11:09 ` Stephen Rothwell
2019-07-05 11:14 ` Pankaj Gupta
2019-07-05 22:32 ` Dan Williams
2019-07-05 23:48 ` Stephen Rothwell
2019-06-20 9:29 Stephen Rothwell
2019-06-20 10:30 ` Pankaj Gupta
2018-04-09 3:16 Stephen Rothwell
2018-04-09 3:38 ` Oliver
2018-04-09 7:34 ` Oliver
2018-04-09 17:11 ` Dan Williams
2018-04-09 18:14 ` Dan Williams
2017-11-03 7:19 Stephen Rothwell
2017-11-03 16:04 ` Dan Williams
2017-09-04 7:34 Stephen Rothwell
2017-09-04 18:34 ` Dan Williams
2017-04-24 6:11 Stephen Rothwell
2017-04-24 8:39 ` Al Viro
2017-04-24 23:29 ` Dan Williams
2017-04-25 22:22 ` Dan Williams
2016-07-22 6:13 Stephen Rothwell
2016-07-23 1:04 ` Dan Williams
2016-07-23 3:54 ` Dan Williams
2016-07-21 6:13 Stephen Rothwell
2016-07-21 21:33 ` Dan Williams
2016-03-27 9:50 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=20210830170938.6fd8813d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dan.j.williams@intel.com \
--cc=hch@lst.de \
--cc=hsiangkao@linux.alibaba.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xiang@kernel.org \
/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).