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

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

vfs: split __dentry_open() 



Split __dentry_open() into two functions:

  do_dentry_open() - does most of the actual work, doesn't put file on failure
  open_check_o_direct() - after a successful open, checks direct_IO method

This will allow i_op->atomic_open to do just the file initialization and leave
the direct_IO checking to the VFS.

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

fs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ extern struct file *do_file_open_root(struct dentry *, struct vfsmount *, 


extern long do_handle_open(int mountdirfd,

			   struct file_handle __user *ufh, int open_flag);

extern int open_check_o_direct(struct file *f);



/*

 * inode.c

fs/open.c

+33 −14
Original line number Diff line number Diff line
@@ -654,7 +654,20 @@ static inline int __get_file_write_access(struct inode *inode, 
	return error;

}



static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,

int open_check_o_direct(struct file *f)

{

	/* NB: we're sure to have correct a_ops only after f_op->open */

	if (f->f_flags & O_DIRECT) {

		if (!f->f_mapping->a_ops ||

		    ((!f->f_mapping->a_ops->direct_IO) &&

		    (!f->f_mapping->a_ops->get_xip_mem))) {

			return -EINVAL;

		}

	}

	return 0;

}



static struct file *do_dentry_open(struct dentry *dentry, struct vfsmount *mnt,

				   struct file *f,

				   int (*open)(struct inode *, struct file *),

				   const struct cred *cred)
@@ -713,16 +726,6 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, 


	file_ra_state_init(&f->f_ra, f->f_mapping->host->i_mapping);



	/* NB: we're sure to have correct a_ops only after f_op->open */

	if (f->f_flags & O_DIRECT) {

		if (!f->f_mapping->a_ops ||

		    ((!f->f_mapping->a_ops->direct_IO) &&

		    (!f->f_mapping->a_ops->get_xip_mem))) {

			fput(f);

			f = ERR_PTR(-EINVAL);

		}

	}



	return f;



cleanup_all:
@@ -750,6 +753,22 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt, 
	return ERR_PTR(error);

}



static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,

				struct file *f,

				int (*open)(struct inode *, struct file *),

				const struct cred *cred)

{

	struct file *res = do_dentry_open(dentry, mnt, f, open, cred);

	if (!IS_ERR(res)) {

		int error = open_check_o_direct(f);

		if (error) {

			fput(res);

			res = ERR_PTR(error);

		}

	}

	return res;

}



/**

 * lookup_instantiate_filp - instantiates the open intent filp

 * @nd: pointer to nameidata