From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, Jaegeuk Kim <jaegeuk@kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Uday Savagaonkar <savagaon@google.com>,
"Theodore Ts'o" <tytso@mit.edu>
Subject: linux-next: build failure after merge of the vfs tree
Date: Mon, 11 May 2015 11:26:12 +1000 [thread overview]
Message-ID: <20150511112612.04e26c8a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 4496 bytes --]
Hi Al,
After merging the vfs tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/f2fs/namei.c: In function 'f2fs_encrypted_follow_link':
fs/f2fs/namei.c:336:10: warning: passing argument 2 of 'f2fs_follow_link' from incompatible pointer type
return f2fs_follow_link(dentry, nd);
^
fs/f2fs/namei.c:311:20: note: expected 'void **' but argument is of type 'struct nameidata *'
static const char *f2fs_follow_link(struct dentry *dentry, void **cookie)
^
fs/f2fs/namei.c:336:3: warning: return discards 'const' qualifier from pointer target type
return f2fs_follow_link(dentry, nd);
^
fs/f2fs/namei.c:379:2: error: implicit declaration of function 'nd_set_link' [-Werror=implicit-function-declaration]
nd_set_link(nd, paddr);
^
fs/f2fs/namei.c: In function 'f2fs_encrypted_put_link':
fs/f2fs/namei.c:400:3: error: implicit declaration of function 'nd_get_link' [-Werror=implicit-function-declaration]
kfree(nd_get_link(nd));
^
fs/f2fs/namei.c:400:3: warning: passing argument 1 of 'kfree' makes pointer from integer without a cast
In file included from fs/f2fs/f2fs.h:17:0,
from fs/f2fs/namei.c:19:
include/linux/slab.h:143:6: note: expected 'const void *' but argument is of type 'int'
void kfree(const void *);
^
fs/f2fs/namei.c: At top level:
fs/f2fs/namei.c:960:2: warning: initialization from incompatible pointer type
.follow_link = f2fs_encrypted_follow_link,
^
fs/f2fs/namei.c:960:2: warning: (near initialization for 'f2fs_symlink_inode_operations.follow_link')
fs/f2fs/namei.c:961:2: warning: initialization from incompatible pointer type
.put_link = f2fs_encrypted_put_link,
^
fs/f2fs/namei.c:961:2: warning: (near initialization for 'f2fs_symlink_inode_operations.put_link')
Caused by commits cf41cea5a829 ("new ->follow_link() and ->put_link()
calling conventions") and 0ad7e33ea980 ("don't pass nameidata to
->follow_link()") from teh vfs tree interacting with commit
5270e98c341b ("f2fs crypto: add symlink encryption") from the f2fs tree.
I applied the following merge fix patch (which I suspect is not
completely correct - especially the f2fs_encrypted_put_link part):
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 11 May 2015 11:22:19 +1000
Subject: [PATCH] f2fs: merge fix for follow_link and put_link changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/f2fs/namei.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index d7ed99ebe95b..42af89cdb9a4 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -320,8 +320,8 @@ static const char *f2fs_follow_link(struct dentry *dentry, void **cookie)
}
#ifdef CONFIG_F2FS_FS_ENCRYPTION
-static void *f2fs_encrypted_follow_link(struct dentry *dentry,
- struct nameidata *nd)
+static const char *f2fs_encrypted_follow_link(struct dentry *dentry,
+ void **cookie)
{
struct page *cpage = NULL;
char *caddr, *paddr = NULL;
@@ -333,7 +333,7 @@ static void *f2fs_encrypted_follow_link(struct dentry *dentry,
u32 max_size = inode->i_sb->s_blocksize;
if (!f2fs_encrypted_inode(inode))
- return f2fs_follow_link(dentry, nd);
+ return f2fs_follow_link(dentry, cookie);
res = f2fs_setup_fname_crypto(inode);
if (res)
@@ -341,7 +341,7 @@ static void *f2fs_encrypted_follow_link(struct dentry *dentry,
cpage = read_mapping_page(inode->i_mapping, 0, NULL);
if (IS_ERR(cpage))
- return cpage;
+ return ERR_CAST(cpage);
caddr = kmap(cpage);
caddr[size] = 0;
@@ -376,12 +376,11 @@ static void *f2fs_encrypted_follow_link(struct dentry *dentry,
/* Null-terminate the name */
if (res <= cstr.len)
paddr[res] = '\0';
- nd_set_link(nd, paddr);
if (cpage) {
kunmap(cpage);
page_cache_release(cpage);
}
- return NULL;
+ return *cookie = paddr;
errout:
if (cpage) {
kunmap(cpage);
@@ -391,14 +390,11 @@ errout:
return ERR_PTR(res);
}
-static void f2fs_encrypted_put_link(struct dentry *dentry, struct nameidata *nd,
- void *cookie)
+static void f2fs_encrypted_put_link(struct dentry *dentry, void *cookie)
{
struct page *page = cookie;
- if (!page) {
- kfree(nd_get_link(nd));
- } else {
+ if (page) {
kunmap(page);
page_cache_release(page);
}
--
2.1.4
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-05-11 1:26 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-11 1:26 Stephen Rothwell [this message]
2015-05-13 2:26 ` linux-next: build failure after merge of the vfs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2021-01-04 22:36 Stephen Rothwell
2021-01-04 23:28 ` Al Viro
2020-10-27 4:14 Stephen Rothwell
2020-10-27 4:59 ` Al Viro
2020-11-10 19:00 ` Al Viro
2020-11-10 21:24 ` Stephen Rothwell
2020-09-28 1:31 Stephen Rothwell
2020-09-28 6:05 ` Christoph Hellwig
2020-09-24 8:30 Stephen Rothwell
2020-09-24 20:08 ` Al Viro
2020-09-25 12:01 ` Stephen Rothwell
2020-09-25 13:38 ` Al Viro
2020-09-29 4:10 ` Josh Poimboeuf
2020-10-06 14:30 ` Josh Poimboeuf
2020-10-06 21:04 ` Stephen Rothwell
2020-10-07 15:46 ` Josh Poimboeuf
2020-07-29 1:56 Stephen Rothwell
2020-07-29 6:33 ` Christoph Hellwig
2020-07-29 19:19 ` Al Viro
2020-07-27 12:06 Stephen Rothwell
2020-05-07 0:39 Stephen Rothwell
2020-05-07 2:35 ` Al Viro
2020-05-07 15:07 ` Jens Axboe
2020-01-10 6:57 Stephen Rothwell
2020-01-10 10:00 ` Carlos Maiolino
2020-01-10 11:03 ` Carlos Maiolino
2020-01-10 22:44 ` Stephen Rothwell
2020-01-13 9:28 ` Carlos Maiolino
2020-01-24 2:41 ` Stephen Rothwell
2020-01-29 22:40 ` Stephen Rothwell
2019-01-02 4:01 Stephen Rothwell
2019-01-30 3:45 ` Stephen Rothwell
2018-10-03 0:32 Stephen Rothwell
2018-10-16 0:17 ` Stephen Rothwell
2018-10-16 16:37 ` Jaegeuk Kim
2018-10-16 20:45 ` Stephen Rothwell
2018-09-10 3:59 Stephen Rothwell
2018-09-10 3:35 Stephen Rothwell
2018-09-18 21:38 ` Stephen Rothwell
2018-09-18 22:17 ` David Howells
2018-09-18 23:49 ` Stephen Rothwell
2018-09-19 7:17 ` Geert Uytterhoeven
2018-09-19 6:01 ` David Howells
2018-09-19 6:31 ` Stephen Rothwell
2018-09-20 10:48 ` Michael Ellerman
2018-09-20 16:20 ` David Howells
2018-09-20 10:44 ` Michael Ellerman
2018-10-29 4:33 ` Stephen Rothwell
2018-10-29 9:07 ` Stephen Rothwell
2018-10-29 9:21 ` David Howells
2018-10-29 10:29 ` Stephen Rothwell
2018-09-06 2:28 Stephen Rothwell
2018-08-07 10:58 Stephen Rothwell
2018-08-07 1:11 Stephen Rothwell
2018-08-06 0:37 Stephen Rothwell
2018-08-06 12:24 ` Stephen Rothwell
2018-08-07 0:59 ` Stephen Rothwell
2018-08-07 2:20 ` Masahiro Yamada
2018-06-19 1:47 Stephen Rothwell
2018-03-19 6:06 Stephen Rothwell
2018-03-19 19:56 ` Mateusz Guzik
2018-04-03 2:26 ` Stephen Rothwell
2018-04-08 2:19 ` Al Viro
2018-04-08 2:55 ` Stephen Rothwell
2017-12-03 23:16 Stephen Rothwell
2017-07-11 0:55 Stephen Rothwell
2017-07-11 9:21 ` David Howells
2017-07-10 2:15 Stephen Rothwell
2017-07-10 2:34 ` Al Viro
2017-02-27 0:27 Stephen Rothwell
2017-02-27 8:31 ` David Howells
2016-07-29 1:19 Stephen Rothwell
2016-07-29 4:18 ` Al Viro
2016-05-02 1:25 Stephen Rothwell
2016-05-02 1:31 ` Al Viro
2016-05-02 4:48 ` Abhijith Das
2015-12-10 0:18 Stephen Rothwell
2015-12-10 0:23 ` Stephen Rothwell
2015-12-10 0:48 ` Al Viro
2015-12-10 15:44 ` Mike Marshall
2015-12-21 0:23 ` Stephen Rothwell
2016-01-07 0:42 ` Stephen Rothwell
2016-01-07 2:09 ` Al Viro
2015-12-09 5:58 Stephen Rothwell
2015-12-09 1:19 Stephen Rothwell
2015-12-09 21:30 ` Mike Marshall
2015-12-09 22:20 ` Stephen Rothwell
2015-12-09 22:53 ` Andreas Grünbacher
2015-12-07 22:42 Stephen Rothwell
2015-03-13 1:02 Stephen Rothwell
2015-03-24 3:24 ` Stephen Rothwell
2015-03-24 10:44 ` Christoph Hellwig
2014-12-10 7:45 Stephen Rothwell
2014-12-11 2:32 ` Al Viro
2014-04-22 1:26 Stephen Rothwell
2014-04-23 0:33 ` Stephen Rothwell
2013-11-07 0:30 Stephen Rothwell
2013-09-09 2:33 Stephen Rothwell
2013-09-09 8:54 ` Ian Kent
2013-06-24 1:35 Stephen Rothwell
2013-06-24 9:34 ` Al Viro
2013-05-01 2:22 Stephen Rothwell
2013-05-01 13:13 ` J. Bruce Fields
2013-04-08 1:15 Stephen Rothwell
2013-04-09 15:49 ` Stephen Rothwell
2013-04-03 0:22 Stephen Rothwell
2013-04-03 1:14 ` Al Viro
2013-04-02 0:26 Stephen Rothwell
2013-04-02 0:39 ` Al Viro
2012-07-16 0:59 Stephen Rothwell
2012-05-31 0:51 Stephen Rothwell
2012-05-31 1:02 ` Al Viro
2012-01-03 1:43 Stephen Rothwell
2012-01-03 13:39 ` Jan Kara
2012-01-03 14:45 ` Al Viro
2012-01-04 2:17 ` Al Viro
2012-01-04 2:50 ` Dave Chinner
2012-01-04 18:00 ` Jan Kara
2012-01-04 18:47 ` Christoph Hellwig
2012-01-04 22:26 ` Jan Kara
2011-12-22 0:15 Stephen Rothwell
2011-12-20 0:31 Stephen Rothwell
2011-12-19 1:06 Stephen Rothwell
2011-12-19 1:12 ` Al Viro
2011-07-16 6:44 Stephen Rothwell
2011-07-25 3:20 ` Stephen Rothwell
2011-07-25 18:26 ` Trond Myklebust
2011-07-16 6:36 Stephen Rothwell
2010-07-19 0:25 Stephen Rothwell
2010-08-04 1:47 ` Stephen Rothwell
2010-07-12 2:24 Stephen Rothwell
2010-07-12 5:31 ` Ryusuke Konishi
2010-06-22 1:22 Stephen Rothwell
2010-08-04 1:50 ` Stephen Rothwell
2010-05-28 1:45 Stephen Rothwell
2010-05-28 1:51 ` Al Viro
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=20150511112612.04e26c8a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=jaegeuk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=savagaon@google.com \
--cc=tytso@mit.edu \
--cc=viro@ZenIV.linux.org.uk \
/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).