diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 14:10:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-20 14:10:36 -0800 |
| commit | 553637f73c314c742243b8dc5ef072e9dadbe581 (patch) | |
| tree | 1c94c2f76775871b23a807f836c395751bede619 /fs/Makefile | |
| parent | c1ef5003079531b5aae12467a350379496752334 (diff) | |
| parent | 9636e650e16f6b01f0044f7662074958c23e4707 (diff) | |
| download | linux-553637f73c314c742243b8dc5ef072e9dadbe581.tar.gz linux-553637f73c314c742243b8dc5ef072e9dadbe581.tar.bz2 linux-553637f73c314c742243b8dc5ef072e9dadbe581.zip | |
Merge tag 'for-6.3/dio-2023-02-16' of git://git.kernel.dk/linux
Pull legacy dio update from Jens Axboe:
"We only have a few file systems that use the old dio code, make them
select it rather than build it unconditionally"
* tag 'for-6.3/dio-2023-02-16' of git://git.kernel.dk/linux:
fs: build the legacy direct I/O code conditionally
fs: move sb_init_dio_done_wq out of direct-io.c
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 76abc9e055bd..05f89b5c962f 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -19,13 +19,14 @@ obj-y := open.o read_write.o file_table.o super.o \ kernel_read_file.o mnt_idmapping.o remap_range.o ifeq ($(CONFIG_BLOCK),y) -obj-y += buffer.o direct-io.o mpage.o +obj-y += buffer.o mpage.o else obj-y += no-block.o endif obj-$(CONFIG_PROC_FS) += proc_namespace.o +obj-$(CONFIG_LEGACY_DIRECT_IO) += direct-io.o obj-y += notify/ obj-$(CONFIG_EPOLL) += eventpoll.o obj-y += anon_inodes.o |