Commit 278ccd32 authored by Damien Le Moal's avatar Damien Le Moal Committed by Li Nan
Browse files

null_blk: Move driver into its own directory 

stable inclusion
from stable-v5.10.176
commit d14d2574a54c2ee7ae6c44a5507973972ecce7f5
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IA7D6H
CVE: CVE-2024-36478

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=d14d2574a54c2ee7ae6c44a5507973972ecce7f5



--------------------------------

[ Upstream commit eebf34a8 ]

Move null_blk driver code into the new sub-directory
drivers/block/null_blk.

Suggested-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Stable-dep-of: 63f88659 ("block: null_blk: Fix handling of fake timeout request")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parent a2768d57

drivers/block/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -16,13 +16,7 @@ menuconfig BLK_DEV 


if BLK_DEV



config BLK_DEV_NULL_BLK

	tristate "Null test block driver"

	select CONFIGFS_FS



config BLK_DEV_NULL_BLK_FAULT_INJECTION

	bool "Support fault injection for Null test block driver"

	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION

source "drivers/block/null_blk/Kconfig"



config BLK_DEV_FD

	tristate "Normal floppy disk support"

drivers/block/Makefile

+1 −6
Original line number Diff line number Diff line
@@ -41,12 +41,7 @@ obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/ 
obj-$(CONFIG_ZRAM) += zram/

obj-$(CONFIG_BLK_DEV_RNBD)	+= rnbd/



obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o

null_blk-objs	:= null_blk_main.o

ifeq ($(CONFIG_BLK_DEV_ZONED), y)

null_blk-$(CONFIG_TRACING) += null_blk_trace.o

endif

null_blk-$(CONFIG_BLK_DEV_ZONED) += null_blk_zoned.o

obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk/



skd-y		:= skd_main.o

swim_mod-y	:= swim.o swim_asm.o

drivers/block/null_blk/Kconfig

0 → 100644
+12 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Null block device driver configuration

#



config BLK_DEV_NULL_BLK

	tristate "Null test block driver"

	select CONFIGFS_FS



config BLK_DEV_NULL_BLK_FAULT_INJECTION

	bool "Support fault injection for Null test block driver"

	depends on BLK_DEV_NULL_BLK && FAULT_INJECTION

drivers/block/null_blk/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



# needed for trace events

ccflags-y			+= -I$(src)



obj-$(CONFIG_BLK_DEV_NULL_BLK)	+= null_blk.o

null_blk-objs			:= main.o

ifeq ($(CONFIG_BLK_DEV_ZONED), y)

null_blk-$(CONFIG_TRACING) 	+= trace.o

endif

null_blk-$(CONFIG_BLK_DEV_ZONED) += zoned.o