block: move fs/block_dev.c to block/bdev.c

Move it together with the rest of the block layer.

Christoph Hellwig committed 5 years ago

Commit 0dca4461 parent cd82cca7 files · +8 −9Browse files

Unified · Split

7 files

Documentation/core-api/kernel-api.rst +3 −0
Documentation/filesystems/api-summary.rst +0 −3
MAINTAINERS +0 −1
block/Makefile +1 −1
block/bdev.c +2 −2
fs/Makefile +1 −1
fs/internal.h +1 −1

Documentation/core-api/kernel-api.rst+3−0

@@ -315,6 +315,9 @@ Block Devices · 314 unmodified lines
315	.. kernel-doc:: block/genhd.c	315	.. kernel-doc:: block/genhd.c
316	:export:	316	:export:
317		317
		318	.. kernel-doc:: block/bdev.c
		319	:export:
		320
318	Char devices	321	Char devices
319	============	322	============
320		323

Documentation/filesystems/api-summary.rst+0−3

@@ -71,9 +71,6 @@ Other Functions · 70 unmodified lines
71	.. kernel-doc:: fs/fs-writeback.c	71	.. kernel-doc:: fs/fs-writeback.c
72	:export:	72	:export:
73		73
74	.. kernel-doc:: fs/block_dev.c
75	:export:
76
77	.. kernel-doc:: fs/anon_inodes.c	74	.. kernel-doc:: fs/anon_inodes.c
78	:export:	75	:export:
79		76

MAINTAINERS+0−1

@@ -3300,7 +3300,6 @@ S: Maintained · 3299 unmodified lines
3300	T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git	3300	T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
3301	F: block/	3301	F: block/
3302	F: drivers/block/	3302	F: drivers/block/
3303	F: fs/block_dev.c
3304	F: include/linux/blk*	3303	F: include/linux/blk*
3305	F: kernel/trace/blktrace.c	3304	F: kernel/trace/blktrace.c
3306	F: lib/sbitmap.c	3305	F: lib/sbitmap.c

block/Makefile+1−1

@@ -3,7 +3,7 @@ · 2 unmodified lines
3	# Makefile for the kernel block layer	3	# Makefile for the kernel block layer
4	#	4	#
5		5
6	obj-$(CONFIG_BLOCK) := fops.o bio.o elevator.o blk-core.o blk-sysfs.o \	6	obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
7	blk-flush.o blk-settings.o blk-ioc.o blk-map.o \	7	blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
8	blk-exec.o blk-merge.o blk-timeout.o \	8	blk-exec.o blk-merge.o blk-timeout.o \
9	blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \	9	blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \

block/bdev.crenamed from fs/block_dev.c+2−2

@@ -26,8 +26,8 @@ · 25 unmodified lines
26	#include <linux/cleancache.h>	26	#include <linux/cleancache.h>
27	#include <linux/part_stat.h>	27	#include <linux/part_stat.h>
28	#include <linux/uaccess.h>	28	#include <linux/uaccess.h>
29	#include "internal.h"	29	#include "../fs/internal.h"
30	#include "../block/blk.h"	30	#include "blk.h"
31		31
32	struct bdev_inode {	32	struct bdev_inode {
33	struct block_device bdev;	33	struct block_device bdev;

fs/Makefile+1−1

@@ -17,7 +17,7 @@ obj-y := open.o read_write.o file_table.o super.o \ · 16 unmodified lines
17	kernel_read_file.o remap_range.o	17	kernel_read_file.o remap_range.o
18		18
19	ifeq ($(CONFIG_BLOCK),y)	19	ifeq ($(CONFIG_BLOCK),y)
20	obj-y += buffer.o block_dev.o direct-io.o mpage.o	20	obj-y += buffer.o direct-io.o mpage.o
21	else	21	else
22	obj-y += no-block.o	22	obj-y += no-block.o
23	endif	23	endif

fs/internal.h+1−1

@@ -18,7 +18,7 @@ struct user_namespace; · 17 unmodified lines
18	struct pipe_inode_info;	18	struct pipe_inode_info;
19		19
20	/*	20	/*
21	* block_dev.c	21	* block/bdev.c
22	*/	22	*/
23	#ifdef CONFIG_BLOCK	23	#ifdef CONFIG_BLOCK
24	extern void __init bdev_cache_init(void);	24	extern void __init bdev_cache_init(void);