From d562e901f25d275b55b0496fe01935beeff0ed37 Mon Sep 17 00:00:00 2001

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

Date: Thu, 23 Sep 2021 18:04:26 +0300

Subject: [Backport d562e901f25d] src: Move ni_lock_dir and ni_unlock into

 ntfs_create_inode

Now ntfs3 locks mutex for smaller time.

Theoretically in successful cases those locks aren't needed at all.

But proving the same for error cases is difficult.

So instead of removing them we just move them.

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

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

---

 src/inode.c | 17 ++++++++++++++---

 src/namei.c | 20 --------------------

 2 files changed, 14 insertions(+), 23 deletions(-)

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

index d51bf40188357e8c292b7ddbbee100d3dfbaeff5..7dd162f6a7e26435b16c08b5efed6e283b975f54 100644

--- a/src/inode.c

+++ b/src/inode.c

@@ -1198,9 +1198,13 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 	struct REPARSE_DATA_BUFFER *rp = NULL;

 	bool rp_inserted = false;

+	ni_lock_dir(dir_ni);

+

 	dir_root = indx_get_root(&dir_ni->dir, dir_ni, NULL, NULL);

-	if (!dir_root)

-		return ERR_PTR(-EINVAL);

+	if (!dir_root) {

+		err = -EINVAL;

+		goto out1;

+	}

 	if (S_ISDIR(mode)) {

 		/* Use parent's directory attributes. */

@@ -1549,6 +1553,9 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 	if (err)

 		goto out6;

+	/* Unlock parent directory before ntfs_init_acl. */

+	ni_unlock(dir_ni);

+

 	inode->i_generation = le16_to_cpu(rec->seq);

 	dir->i_mtime = dir->i_ctime = inode->i_atime;

@@ -1605,8 +1612,10 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 out7:

 	/* Undo 'indx_insert_entry'. */

+	ni_lock_dir(dir_ni);

 	indx_delete_entry(&dir_ni->dir, dir_ni, new_de + 1,

 			  le16_to_cpu(new_de->key_size), sbi);

+	/* ni_unlock(dir_ni); will be called later. */

 out6:

 	if (rp_inserted)

 		ntfs_remove_reparse(sbi, IO_REPARSE_TAG_SYMLINK, &new_de->ref);

@@ -1630,8 +1639,10 @@ struct inode *ntfs_create_inode(struct user_namespace *mnt_userns,

 	kfree(rp);

 out1:

-	if (err)

+	if (err) {

+		ni_unlock(dir_ni);

 		return ERR_PTR(err);

+	}

 	unlock_new_inode(inode);

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

index 1c475da4e19d1158e3c11fcb749fb0825d2d7ae6..bc741213ad84833b7fd434c32d4b784c6e7cb2f7 100644

--- a/src/namei.c

+++ b/src/namei.c

@@ -95,16 +95,11 @@ static struct dentry *ntfs_lookup(struct inode *dir, struct dentry *dentry,

 static int ntfs_create(struct user_namespace *mnt_userns, struct inode *dir,

 		       struct dentry *dentry, umode_t mode, bool excl)

 {

-	struct ntfs_inode *ni = ntfs_i(dir);

 	struct inode *inode;

-	ni_lock_dir(ni);

-

 	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFREG | mode,

 				  0, NULL, 0, NULL);

-	ni_unlock(ni);

-

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

 }

@@ -116,16 +111,11 @@ static int ntfs_create(struct user_namespace *mnt_userns, struct inode *dir,

 static int ntfs_mknod(struct user_namespace *mnt_userns, struct inode *dir,

 		      struct dentry *dentry, umode_t mode, dev_t rdev)

 {

-	struct ntfs_inode *ni = ntfs_i(dir);

 	struct inode *inode;

-	ni_lock_dir(ni);

-

 	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, mode, rdev,

 				  NULL, 0, NULL);

-	ni_unlock(ni);

-

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

 }

@@ -196,15 +186,10 @@ static int ntfs_symlink(struct user_namespace *mnt_userns, struct inode *dir,

 {

 	u32 size = strlen(symname);

 	struct inode *inode;

-	struct ntfs_inode *ni = ntfs_i(dir);

-

-	ni_lock_dir(ni);

 	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFLNK | 0777,

 				  0, symname, size, NULL);

-	ni_unlock(ni);

-

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

 }

@@ -215,15 +200,10 @@ static int ntfs_mkdir(struct user_namespace *mnt_userns, struct inode *dir,

 		      struct dentry *dentry, umode_t mode)

 {

 	struct inode *inode;

-	struct ntfs_inode *ni = ntfs_i(dir);

-

-	ni_lock_dir(ni);

 	inode = ntfs_create_inode(mnt_userns, dir, dentry, NULL, S_IFDIR | mode,

 				  0, NULL, 0, NULL);

-	ni_unlock(ni);

-

 	return IS_ERR(inode) ? PTR_ERR(inode) : 0;

 }

-- 

2.31.1