Skip to content

Commit b3f0515

Browse files
Christoph HellwigAl Viro
authored andcommitted
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: Christoph Hellwig <hch@lst.de> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
1 parent 09f1bde commit b3f0515

1 file changed

Lines changed: 12 additions & 21 deletions

File tree

fs/stat.c

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,6 @@ int vfs_fstat(int fd, struct kstat *stat)
148148
return error;
149149
}
150150

151-
static inline unsigned vfs_stat_set_lookup_flags(unsigned *lookup_flags,
152-
int flags)
153-
{
154-
if ((flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT |
155-
AT_EMPTY_PATH | KSTAT_QUERY_FLAGS)) != 0)
156-
return -EINVAL;
157-
158-
*lookup_flags = LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT;
159-
if (flags & AT_SYMLINK_NOFOLLOW)
160-
*lookup_flags &= ~LOOKUP_FOLLOW;
161-
if (flags & AT_NO_AUTOMOUNT)
162-
*lookup_flags &= ~LOOKUP_AUTOMOUNT;
163-
if (flags & AT_EMPTY_PATH)
164-
*lookup_flags |= LOOKUP_EMPTY;
165-
166-
return 0;
167-
}
168-
169151
/**
170152
* vfs_statx - Get basic and extra attributes by filename
171153
* @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,
185167
struct kstat *stat, u32 request_mask)
186168
{
187169
struct path path;
188-
int error = -EINVAL;
189-
unsigned lookup_flags;
170+
unsigned lookup_flags = 0;
171+
int error;
190172

191-
if (vfs_stat_set_lookup_flags(&lookup_flags, flags))
173+
if (flags & ~(AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT | AT_EMPTY_PATH |
174+
KSTAT_QUERY_FLAGS))
192175
return -EINVAL;
176+
177+
if (!(flags & AT_SYMLINK_NOFOLLOW))
178+
lookup_flags |= LOOKUP_FOLLOW;
179+
if (!(flags & AT_NO_AUTOMOUNT))
180+
lookup_flags |= LOOKUP_AUTOMOUNT;
181+
if (flags & AT_EMPTY_PATH)
182+
lookup_flags |= LOOKUP_EMPTY;
183+
193184
retry:
194185
error = user_path_at(dfd, filename, lookup_flags, &path);
195186
if (error)

0 commit comments

Comments
 (0)