diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2024-09-27 08:13:52 +0200 |
| commit | 3a39d672e7f48b8d6b91a09afa4b55352773b4b5 (patch) | |
| tree | f7ec4043b508f48430dd09ac338c38acf7d5a6cd /fs/stat.c | |
| parent | 151ac45348afc5b56baa584c7cd4876addf461ff (diff) | |
| parent | 62a0e2fa40c5c06742b8b4997ba5095a3ec28503 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts and no adjacent changes.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'fs/stat.c')
| -rw-r--r-- | fs/stat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/stat.c b/fs/stat.c index 89ce1be56310..41e598376d7e 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -224,9 +224,9 @@ int vfs_fstat(int fd, struct kstat *stat) int error; f = fdget_raw(fd); - if (!f.file) + if (!fd_file(f)) return -EBADF; - error = vfs_getattr(&f.file->f_path, stat, STATX_BASIC_STATS, 0); + error = vfs_getattr(&fd_file(f)->f_path, stat, STATX_BASIC_STATS, 0); fdput(f); return error; } @@ -277,9 +277,9 @@ static int vfs_statx_fd(int fd, int flags, struct kstat *stat, u32 request_mask) { CLASS(fd_raw, f)(fd); - if (!f.file) + if (!fd_file(f)) return -EBADF; - return vfs_statx_path(&f.file->f_path, flags, stat, request_mask); + return vfs_statx_path(&fd_file(f)->f_path, flags, stat, request_mask); } /** |