Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d268c9b authored by Al Viro's avatar Al Viro
Browse files

overlayfs: don't hold ->i_mutex over opening the real directory 



just use it to serialize the assignment

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1be47b38

fs/overlayfs/readdir.c

+13 −6
Original line number Diff line number Diff line
@@ -458,21 +458,28 @@ static int ovl_dir_fsync(struct file *file, loff_t start, loff_t end, 
	if (!od->is_upper && ovl_path_type(dentry) == OVL_PATH_MERGE) {

		struct inode *inode = file_inode(file);



		mutex_lock(&inode->i_mutex);

		realfile = od->upperfile;

		if (!realfile) {

			struct path upperpath;



			ovl_path_upper(dentry, &upperpath);

			realfile = ovl_path_open(&upperpath, O_RDONLY);

			mutex_lock(&inode->i_mutex);

			if (!od->upperfile) {

				if (IS_ERR(realfile)) {

					mutex_unlock(&inode->i_mutex);

					return PTR_ERR(realfile);

				}

				od->upperfile = realfile;

			} else {

				/* somebody has beaten us to it */

				if (!IS_ERR(realfile))

					fput(realfile);

				realfile = od->upperfile;

			}

			mutex_unlock(&inode->i_mutex);

		}

	}



	return vfs_fsync_range(realfile, start, end, datasync);

}