From 66019837a5563e1f80a4228b7d110d8c52bfdd8b Mon Sep 17 00:00:00 2001

From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

Date: Wed, 22 Sep 2021 18:50:58 +0300

Subject: [Backport 66019837a556] src: Refactoring lock in ntfs_init_acl

This is possible because of moving lock into ntfs_create_inode.

Reviewed-by: Kari Argillander <kari.argillander@gmail.com>

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/xattr.c | 55 ++++++++++++------------------------------------

 1 file changed, 14 insertions(+), 41 deletions(-)

diff --git a/src/xattr.c b/src/xattr.c

index 59ec5e61a2390511a633c39b4e8ae3b01a2b9840..83bbee277e12ec795dde29cf279b7eb96af961bc 100644

--- a/src/xattr.c

+++ b/src/xattr.c

@@ -693,54 +693,27 @@ int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,

 	struct posix_acl *default_acl, *acl;

 	int err;

-	/*

-	 * TODO: Refactoring lock.

-	 * ni_lock(dir) ... -> posix_acl_create(dir,...) -> ntfs_get_acl -> ni_lock(dir)

-	 */

-	inode->i_default_acl = NULL;

-

-	default_acl = ntfs_get_acl_ex(mnt_userns, dir, ACL_TYPE_DEFAULT, 1);

-

-	if (!default_acl || default_acl == ERR_PTR(-EOPNOTSUPP)) {

-		inode->i_mode &= ~current_umask();

-		err = 0;

-		goto out;

-	}

-

-	if (IS_ERR(default_acl)) {

-		err = PTR_ERR(default_acl);

-		goto out;

-	}

-

-	acl = default_acl;

-	err = __posix_acl_create(&acl, GFP_NOFS, &inode->i_mode);

-	if (err < 0)

-		goto out1;

-	if (!err) {

-		posix_acl_release(acl);

-		acl = NULL;

-	}

-

-	if (!S_ISDIR(inode->i_mode)) {

-		posix_acl_release(default_acl);

-		default_acl = NULL;

-	}

+	err = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl;;

+	if (err)

+		return err;

-	if (default_acl)

+	if (default_acl) {

 		err = ntfs_set_acl_ex(mnt_userns, inode, default_acl,

 				      ACL_TYPE_DEFAULT, 1);

+		posix_acl_release(default_acl);

+	} else {

+		inode->i_default_acl = NULL;

+	}

 	if (!acl)

 		inode->i_acl = NULL;

-	else if (!err)

-		err = ntfs_set_acl_ex(mnt_userns, inode, acl, ACL_TYPE_ACCESS,

-				      1);

-

-	posix_acl_release(acl);

-out1:

-	posix_acl_release(default_acl);

+	else {

+		if (!err)

+			err = ntfs_set_acl_ex(mnt_userns, inode, acl,

+					      ACL_TYPE_ACCESS, 1);

+		posix_acl_release(acl);

+	}

-out:

 	return err;

 }

 #endif

-- 

2.31.1