Commit 88a20626 authored by Al Viro's avatar Al Viro
Browse files

kill getname_statx_lookup_flags() 



LOOKUP_EMPTY is ignored by the only remaining user, and without
that 'getname_' prefix makes no sense.

Remove LOOKUP_EMPTY part, rename to statx_lookup_flags() and make
static.  It most likely is _not_ statx() specific, either, but
that's the next step.

Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8e15e12d

fs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -246,7 +246,6 @@ int open_namespace(struct ns_common *ns); 
 * fs/stat.c:

 */



int getname_statx_lookup_flags(int flags);

int do_statx(int dfd, struct filename *filename, unsigned int flags,

	     unsigned int mask, struct statx __user *buffer);

int do_statx_fd(int fd, unsigned int flags, unsigned int mask,

fs/stat.c

+2 −4
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ int vfs_fstat(int fd, struct kstat *stat) 
	return error;

}



int getname_statx_lookup_flags(int flags)

static int statx_lookup_flags(int flags)

{

	int lookup_flags = 0;
@@ -239,8 +239,6 @@ int getname_statx_lookup_flags(int flags) 
		lookup_flags |= LOOKUP_FOLLOW;

	if (!(flags & AT_NO_AUTOMOUNT))

		lookup_flags |= LOOKUP_AUTOMOUNT;

	if (flags & AT_EMPTY_PATH)

		lookup_flags |= LOOKUP_EMPTY;



	return lookup_flags;

}
@@ -301,7 +299,7 @@ static int vfs_statx(int dfd, struct filename *filename, int flags, 
	      struct kstat *stat, u32 request_mask)

{

	struct path path;

	unsigned int lookup_flags = getname_statx_lookup_flags(flags);

	unsigned int lookup_flags = statx_lookup_flags(flags);

	int error;



	if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_EMPTY_PATH |