summaryrefslogtreecommitdiffstats
path: root/fs/Makefile
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2023-05-08 07:44:05 -0700
committerJens Axboe <axboe@kernel.dk>2023-05-19 19:48:53 -0600
commitbda2795a630b2f6c417675bfbf4d90ef7503dfc7 (patch)
tree43c2281158fd9d0a10179eeeee4fd9f33e91d415 /fs/Makefile
parent3e49c1e4a6152b6ad758a28ecce8fb470f46f6ed (diff)
downloadlinux-stable-bda2795a630b2f6c417675bfbf4d90ef7503dfc7.tar.gz
linux-stable-bda2795a630b2f6c417675bfbf4d90ef7503dfc7.tar.bz2
linux-stable-bda2795a630b2f6c417675bfbf4d90ef7503dfc7.zip
fs: remove the special !CONFIG_BLOCK def_blk_fops
def_blk_fops always returns -ENODEV, which dosn't match the return value of a non-existing block device with CONFIG_BLOCK, which is -ENXIO. Just remove the extra implementation and fall back to the default no_open_fops that always returns -ENXIO. Fixes: 9361401eb761 ("[PATCH] BLOCK: Make it possible to disable the block layer [try #6]") Signed-off-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20230508144405.41792-1-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/Makefile')
-rw-r--r--fs/Makefile10
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/Makefile b/fs/Makefile
index 834f1c3dba46..4709eba1303c 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -17,14 +17,8 @@ obj-y := open.o read_write.o file_table.o super.o \
fs_types.o fs_context.o fs_parser.o fsopen.o init.o \
kernel_read_file.o mnt_idmapping.o remap_range.o
-ifeq ($(CONFIG_BLOCK),y)
-obj-y += buffer.o mpage.o
-else
-obj-y += no-block.o
-endif
-
-obj-$(CONFIG_PROC_FS) += proc_namespace.o
-
+obj-$(CONFIG_BLOCK) += buffer.o mpage.o
+obj-$(CONFIG_PROC_FS) += proc_namespace.o
obj-$(CONFIG_LEGACY_DIRECT_IO) += direct-io.o
obj-y += notify/
obj-$(CONFIG_EPOLL) += eventpoll.o