diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-08-18 21:17:10 -0700 |
| commit | 268603d79cc48dba671e9caf108fab32315b86a2 (patch) | |
| tree | 77466c8c4c104397d1c459674f7a75c4fd60455a /include/linux/fs.h | |
| parent | 8c78c1e52b0b86bd282c41f3725beabe3c244b94 (diff) | |
| parent | 4c2d0b039c5cc0112206a5b22431b577cb1c57ad (diff) | |
| download | linux-268603d79cc48dba671e9caf108fab32315b86a2.tar.gz linux-268603d79cc48dba671e9caf108fab32315b86a2.tar.bz2 linux-268603d79cc48dba671e9caf108fab32315b86a2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 5113f65c786f..9eced4cc286e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -340,17 +340,12 @@ enum rw_hint { struct kiocb { struct file *ki_filp; - - /* The 'ki_filp' pointer is shared in a union for aio */ - randomized_struct_fields_start - loff_t ki_pos; void (*ki_complete)(struct kiocb *iocb, long ret); void *private; int ki_flags; u16 ki_ioprio; /* See linux/ioprio.h */ struct wait_page_queue *ki_waitq; /* for async buffered IO */ - randomized_struct_fields_end }; static inline bool is_sync_kiocb(struct kiocb *kiocb) |