diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 18:35:36 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-09-23 18:35:36 +0200 |
| commit | f8ffbc365f703d74ecca8ca787318d05bbee2bf7 (patch) | |
| tree | cdb3e023473e02a186b39fe541eb719ed2ffcb7f /fs/signalfd.c | |
| parent | mm: fix build on 32-bit targets without MAX_PHYSMEM_BITS (diff) | |
| parent | add struct fd constructors, get rid of __to_fd() (diff) | |
| download | linux-f8ffbc365f703d74ecca8ca787318d05bbee2bf7.tar.xz linux-f8ffbc365f703d74ecca8ca787318d05bbee2bf7.zip | |
Merge tag 'pull-stable-struct_fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull 'struct fd' updates from Al Viro:
"Just the 'struct fd' layout change, with conversion to accessor
helpers"
* tag 'pull-stable-struct_fd' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
add struct fd constructors, get rid of __to_fd()
struct fd: representation change
introduce fd_file(), convert all accessors to it.
Diffstat (limited to 'fs/signalfd.c')
| -rw-r--r-- | fs/signalfd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/signalfd.c b/fs/signalfd.c index d0333bce015e..736bebf93591 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -289,10 +289,10 @@ static int do_signalfd4(int ufd, sigset_t *mask, int flags) fd_install(ufd, file); } else { struct fd f = fdget(ufd); - if (!f.file) + if (!fd_file(f)) return -EBADF; - ctx = f.file->private_data; - if (f.file->f_op != &signalfd_fops) { + ctx = fd_file(f)->private_data; + if (fd_file(f)->f_op != &signalfd_fops) { fdput(f); return -EINVAL; } |