Commit b3f05150 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

fs: remove vfs_stat_set_lookup_flags 



The function really obsfucates checking for valid flags and setting the
lookup flags.  The fact that it returns -EINVAL through and unsigned
return value, which is then used as boolean really doesn't help either.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 09f1bde4

fs/stat.c

+12 −21
Original line number Diff line number Diff line
@@ -148,24 +148,6 @@ int vfs_fstat(int fd, struct kstat *stat) 
	return error;

}



static inline unsigned vfs_stat_set_lookup_flags(unsigned *lookup_flags,

						 int flags)

{

	if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |

		       AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)

		return -EINVAL;



	*lookup_flags = LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;

	if (flags & AT_SYMLINK_NOFOLLOW)

		*lookup_flags &= ~LOOKUP_FOLLOW;

	if (flags & AT_NO_AUTOMOUNT)

		*lookup_flags &= ~LOOKUP_AUTOMOUNT;

	if (flags & AT_EMPTY_PATH)

		*lookup_flags |= LOOKUP_EMPTY;



	return 0;

}



/**

 * vfs_statx - Get basic and extra attributes by filename

 * @dfd: A file descriptor representing the base dir for a relative filename
@@ -185,11 +167,20 @@ static int vfs_statx(int dfd, const char __user *filename, int flags, 
	      struct kstat *stat, u32 request_mask)

{

	struct path path;

	int error = -EINVAL;

	unsigned lookup_flags;

	unsigned lookup_flags = 0;

	int error;



	if (vfs_stat_set_lookup_flags(&lookup_flags, flags))

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

		      KSTAT_QUERY_FLAGS))

		return -EINVAL;



	if (!(flags & AT_SYMLINK_NOFOLLOW))

		lookup_flags |= LOOKUP_FOLLOW;

	if (!(flags & AT_NO_AUTOMOUNT))

		lookup_flags |= LOOKUP_AUTOMOUNT;

	if (flags & AT_EMPTY_PATH)

		lookup_flags |= LOOKUP_EMPTY;



retry:

	error = user_path_at(dfd, filename, lookup_flags, &path);

	if (error)

CRA Git | Maintained and supported by SUSTech CRA and CCSE