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

Commit a8277b9b authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

vfs: move O_DIRECT check to common code 



Perform open_check_o_direct() in a common place in do_last after opening the
file.

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent f60dc3db

fs/namei.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -2305,22 +2305,15 @@ static struct file *atomic_open(struct nameidata *nd, struct dentry *dentry, 
	 * here.

	 * here.

	 */

	 */

	error = may_open(&filp->f_path, acc_mode, open_flag);

	error = may_open(&filp->f_path, acc_mode, open_flag);

	if (error)

	if (error) {

		goto out_fput;

		fput(filp);



		filp = ERR_PTR(error);

	error = open_check_o_direct(filp);

	}

	if (error)

		goto out_fput;





out:

out:

	dput(dentry);

	dput(dentry);

	return filp;

	return filp;





out_fput:

	fput(filp);

	filp = ERR_PTR(error);

	goto out;



no_open:

no_open:

	if (need_lookup) {

	if (need_lookup) {

		dentry = lookup_real(dir, dentry, nd);

		dentry = lookup_real(dir, dentry, nd);
@@ -2619,10 +2612,10 @@ static struct file *do_last(struct nameidata *nd, struct path *path, 
			goto stale_open;

			goto stale_open;

		goto out;

		goto out;

	}

	}

opened:

	error = open_check_o_direct(filp);

	error = open_check_o_direct(filp);

	if (error)

	if (error)

		goto exit_fput;

		goto exit_fput;

opened:

	error = ima_file_check(filp, op->acc_mode);

	error = ima_file_check(filp, op->acc_mode);

	if (error)

	if (error)

		goto exit_fput;

		goto exit_fput;