Kill path_lookup_open() (2dd6d1f4) · Commits · e / devices / android_kernel_xiaomi_markw

fs/namei.c

+16 −32

Original line number	Diff line number	Diff line
		@@ -1124,36 +1124,6 @@ int vfs_path_lookup(struct dentry dentry, struct vfsmount mnt,
		return retval;
		}

		/**
		* path_lookup_open - lookup a file path with open intent
		* @dfd: the directory to use as base, or AT_FDCWD
		* @name: pointer to file name
		* @lookup_flags: lookup intent flags
		* @nd: pointer to nameidata
		* @open_flags: open intent flags
		*/
		static int path_lookup_open(int dfd, const char *name,
		unsigned int lookup_flags, struct nameidata *nd, int open_flags)
		{
		struct file *filp = get_empty_filp();
		int err;

		if (filp == NULL)
		return -ENFILE;
		nd->intent.open.file = filp;
		nd->intent.open.flags = open_flags;
		nd->intent.open.create_mode = 0;
		err = do_path_lookup(dfd, name, lookup_flags\|LOOKUP_OPEN, nd);
		if (IS_ERR(nd->intent.open.file)) {
		if (err == 0) {
		err = PTR_ERR(nd->intent.open.file);
		path_put(&nd->path);
		}
		} else if (err != 0)
		release_open_intent(nd);
		return err;
		}

		static struct dentry __lookup_hash(struct qstr name,
		struct dentry base, struct nameidata nd)
		{
		@@ -1664,8 +1634,22 @@ struct file do_filp_open(int dfd, const char pathname,
		* The simplest case - just a plain lookup.
		*/
		if (!(flag & O_CREAT)) {
		error = path_lookup_open(dfd, pathname, lookup_flags(flag),
		&nd, flag);
		filp = get_empty_filp();

		if (filp == NULL)
		return ERR_PTR(-ENFILE);
		nd.intent.open.file = filp;
		nd.intent.open.flags = flag;
		nd.intent.open.create_mode = 0;
		error = do_path_lookup(dfd, pathname,
		lookup_flags(flag)\|LOOKUP_OPEN, &nd);
		if (IS_ERR(nd.intent.open.file)) {
		if (error == 0) {
		error = PTR_ERR(nd.intent.open.file);
		path_put(&nd.path);
		}
		} else if (error)
		release_open_intent(&nd);
		if (error)
		return ERR_PTR(error);
		goto ok;