From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Feb 2023 22:10:36 +0000 (-0800)
Subject: Merge tag 'for-6.3/dio-2023-02-16' of git://git.kernel.dk/linux
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=553637f73c314c742243b8dc5ef072e9dadbe581;p=linux.git

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
---

553637f73c314c742243b8dc5ef072e9dadbe581
diff --cc fs/Makefile
index 76abc9e055bd5,606c029e1c9bc..05f89b5c962f8
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -16,10 -16,10 +16,10 @@@ obj-y :=	open.o read_write.o file_table
  		pnode.o splice.o sync.o utimes.o d_path.o \
  		stack.o fs_struct.o statfs.o fs_pin.o nsfs.o \
  		fs_types.o fs_context.o fs_parser.o fsopen.o init.o \
 -		kernel_read_file.o remap_range.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