linux-next: build failure after merge of the ntfs3 tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxx>
---
 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: pgpJJTZn55_Ma.pgp
Description: OpenPGP digital signature