Unverified Commit 66019837 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Refactoring lock in ntfs_init_acl 



This is possible because of moving lock into ntfs_create_inode.

Reviewed-by: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent ba77237e

fs/ntfs3/xattr.c

+14 −41
Original line number Diff line number Diff line
@@ -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);



	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);

	}



out:

	return err;

}

#endif