diff options
| author | Linus Torvalds | 2020-07-10 08:53:21 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-07-10 08:53:21 -0700 |
| commit | d02b0478c1acb00e9d9ee40810627eba5745d94b (patch) | |
| tree | 9c522f00c574d8641c0242dd606ac30ea7909582 /include | |
| parent | f4c8824cbcc64524905f83388eb1139747829756 (diff) | |
| parent | 20f829999c38b18e3d17f9e40dea3a28f721fac4 (diff) | |
Merge tag 'gfs2-v5.8-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fixes from Andreas Gruenbacher:
"Fix gfs2 readahead deadlocks by adding a IOCB_NOIO flag that allows
gfs2 to use the generic fiel read iterator functions without having to
worry about being called back while holding locks".
* tag 'gfs2-v5.8-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
gfs2: Rework read and page fault locking
fs: Add IOCB_NOIO flag for generic_file_read_iter
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f881a892ea7..4b7cb76e5837 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -315,6 +315,7 @@ enum rw_hint { #define IOCB_SYNC (1 << 5) #define IOCB_WRITE (1 << 6) #define IOCB_NOWAIT (1 << 7) +#define IOCB_NOIO (1 << 9) struct kiocb { struct file *ki_filp; |