* linux-next: build failure after merge of the ntfs3 tree
@ 2022-11-14 23:17 Stephen Rothwell
2022-11-17 8:56 ` Christian Brauner
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2022-11-14 23:17 UTC (permalink / raw)
To: Konstantin Komarov, Christian Brauner, Seth Forshee
Cc: Christian Brauner (Microsoft),
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1643 bytes --]
Hi all,
After merging the ntfs3 tree, today's linux-next build (x86_64
allmodconfig) failed like this:
fs/ntfs3/namei.c: In function 'ntfs_atomic_open':
fs/ntfs3/namei.c:374:39: error: implicit declaration of function 'get_acl' [-Werror=implicit-function-declaration]
374 | struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT);
| ^~~~~~~
fs/ntfs3/namei.c:374:39: error: initialization of 'struct posix_acl *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
Caused by commit
2b108260ea2c ("fs/ntfs3: atomic_open implementation")
interacting with commit
cac2f8b8d8b5 ("fs: rename current get acl method")
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2022 10:07:59 +1100
Subject: [PATCH] fix up for "fs: rename current get acl method"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
fs/ntfs3/namei.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
index 20a6ac883312..c8db35e2ae17 100644
--- a/fs/ntfs3/namei.c
+++ b/fs/ntfs3/namei.c
@@ -371,7 +371,7 @@ static int ntfs_atomic_open(struct inode *dir, struct dentry *dentry,
* ntfs_create_inode -> ntfs_init_acl -> posix_acl_create ->
* ntfs_get_acl -> ntfs_get_acl_ex -> ni_lock
*/
- struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT);
+ struct posix_acl *p = get_inode_acl(dir, ACL_TYPE_DEFAULT);
if (IS_ERR(p)) {
err = PTR_ERR(p);
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the ntfs3 tree
2022-11-14 23:17 linux-next: build failure after merge of the ntfs3 tree Stephen Rothwell
@ 2022-11-17 8:56 ` Christian Brauner
2022-11-17 10:04 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Christian Brauner @ 2022-11-17 8:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Konstantin Komarov, Christian Brauner, Seth Forshee,
Linux Kernel Mailing List, Linux Next Mailing List
On Tue, Nov 15, 2022 at 10:17:56AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the ntfs3 tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> fs/ntfs3/namei.c: In function 'ntfs_atomic_open':
> fs/ntfs3/namei.c:374:39: error: implicit declaration of function 'get_acl' [-Werror=implicit-function-declaration]
> 374 | struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT);
> | ^~~~~~~
> fs/ntfs3/namei.c:374:39: error: initialization of 'struct posix_acl *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]
>
> Caused by commit
>
> 2b108260ea2c ("fs/ntfs3: atomic_open implementation")
>
> interacting with commit
>
> cac2f8b8d8b5 ("fs: rename current get acl method")
>
> I have applied the following merge fix patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 15 Nov 2022 10:07:59 +1100
> Subject: [PATCH] fix up for "fs: rename current get acl method"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> fs/ntfs3/namei.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ntfs3/namei.c b/fs/ntfs3/namei.c
> index 20a6ac883312..c8db35e2ae17 100644
> --- a/fs/ntfs3/namei.c
> +++ b/fs/ntfs3/namei.c
> @@ -371,7 +371,7 @@ static int ntfs_atomic_open(struct inode *dir, struct dentry *dentry,
> * ntfs_create_inode -> ntfs_init_acl -> posix_acl_create ->
> * ntfs_get_acl -> ntfs_get_acl_ex -> ni_lock
> */
> - struct posix_acl *p = get_acl(dir, ACL_TYPE_DEFAULT);
> + struct posix_acl *p = get_inode_acl(dir, ACL_TYPE_DEFAULT);
>
> if (IS_ERR(p)) {
> err = PTR_ERR(p);
Hey Stephen,
Thank you for the report! Your fix is correct. @Konstantin can either
pull in
ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git fs.acl.rework
or I'll make a note and will let Linus know during the merge window
about this issue. In the latter case I'd just copy-paste your patch to
Linus, Stephen?
Thanks!
Christian
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: build failure after merge of the ntfs3 tree
2022-11-17 8:56 ` Christian Brauner
@ 2022-11-17 10:04 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2022-11-17 10:04 UTC (permalink / raw)
To: Christian Brauner
Cc: Konstantin Komarov, Christian Brauner, Seth Forshee,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 399 bytes --]
Hi Christian,
On Thu, 17 Nov 2022 09:56:44 +0100 Christian Brauner <brauner@kernel.org> wrote:
>
> or I'll make a note and will let Linus know during the merge window
> about this issue. In the latter case I'd just copy-paste your patch to
> Linus, Stephen?
Or just include a Lore link to my email in your pull request (along
with a short explanation).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-17 10:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-14 23:17 linux-next: build failure after merge of the ntfs3 tree Stephen Rothwell
2022-11-17 8:56 ` Christian Brauner
2022-11-17 10:04 ` Stephen Rothwell
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).