diff options
| author | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2023-12-21 13:21:52 +0100 |
| commit | 2137e1564267001b25143d21bc619189c1f74bc6 (patch) | |
| tree | e5d680049a77852f4cde8aa396c0faa72de4c854 /include/linux/fs.h | |
| parent | 1bfc466b13cf6652ba227c282c27a30ffede69a5 (diff) | |
| parent | 4e94ddfe2aab72139acb8d5372fac9e6c3f3e383 (diff) | |
Merge branch 'vfs.file'
Bring in the changes to the file infrastructure for this cycle. Mostly
cleanups and some performance tweaks.
* file: remove __receive_fd()
* file: stop exposing receive_fd_user()
* fs: replace f_rcuhead with f_task_work
* file: remove pointless wrapper
* file: s/close_fd_get_file()/file_close_fd()/g
* Improve __fget_files_rcu() code generation (and thus __fget_light())
* file: massage cleanup of files that failed to open
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'include/linux/fs.h')
| -rw-r--r-- | include/linux/fs.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index a3a48a5d8728..3d58376ed39e 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -991,8 +991,10 @@ static inline int ra_has_index(struct file_ra_state *ra, pgoff_t index) */ struct file { union { + /* fput() uses task work when closing and freeing file (default). */ + struct callback_head f_task_work; + /* fput() must use workqueue (most kernel threads). */ struct llist_node f_llist; - struct rcu_head f_rcuhead; unsigned int f_iocb_flags; }; |