fs: push the getname from do_rmdir into the callers (e24ab0ef) · Commits · 戴 / test

fs/internal.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ extern int vfs_path_lookup(struct dentry , struct vfsmount ,
		long do_mknodat(int dfd, const char __user *filename, umode_t mode,
		unsigned int dev);
		long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);
		long do_rmdir(int dfd, const char __user *pathname);
		long do_rmdir(int dfd, struct filename *name);
		long do_unlinkat(int dfd, struct filename *name);
		long do_symlinkat(const char __user *oldname, int newdfd,
		const char __user *newname);

+4 −6

Original line number	Diff line number	Diff line
		@@ -3720,17 +3720,16 @@ out:
		}
		EXPORT_SYMBOL(vfs_rmdir);

		long do_rmdir(int dfd, const char __user *pathname)
		long do_rmdir(int dfd, struct filename *name)
		{
		int error = 0;
		struct filename *name;
		struct dentry *dentry;
		struct path path;
		struct qstr last;
		int type;
		unsigned int lookup_flags = 0;
		retry:
		name = filename_parentat(dfd, getname(pathname), lookup_flags,
		name = filename_parentat(dfd, name, lookup_flags,
		&path, &last, &type);
		if (IS_ERR(name))
		return PTR_ERR(name);
		@@ -3781,7 +3780,7 @@ exit1:

		SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
		{
		return do_rmdir(AT_FDCWD, pathname);
		return do_rmdir(AT_FDCWD, getname(pathname));
		}

		/**
		@@ -3926,8 +3925,7 @@ SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
		return -EINVAL;

		if (flag & AT_REMOVEDIR)
		return do_rmdir(dfd, pathname);

		return do_rmdir(dfd, getname(pathname));
		return do_unlinkat(dfd, getname(pathname));
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -1281,11 +1281,11 @@ static inline long ksys_unlink(const char __user *pathname)
		return do_unlinkat(AT_FDCWD, getname(pathname));
		}

		extern long do_rmdir(int dfd, const char __user *pathname);
		long do_rmdir(int dfd, struct filename *name);

		static inline long ksys_rmdir(const char __user *pathname)
		{
		return do_rmdir(AT_FDCWD, pathname);
		return do_rmdir(AT_FDCWD, getname(pathname));
		}

		extern long do_mkdirat(int dfd, const char __user *pathname, umode_t mode);