Skip to content

Commit 0dca446

Browse files
Christoph Hellwigaxboe
authored andcommitted
block: move fs/block_dev.c to block/bdev.c
Move it together with the rest of the block layer. Signed-off-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent cd82cca commit 0dca446

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

Documentation/core-api/kernel-api.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,9 @@ Block Devices
315315
.. kernel-doc:: block/genhd.c
316316
:export:
317317

318+
.. kernel-doc:: block/bdev.c
319+
:export:
320+
318321
Char devices
319322
============
320323

Documentation/filesystems/api-summary.rst

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ Other Functions
7171
.. kernel-doc:: fs/fs-writeback.c
7272
:export:
7373

74-
.. kernel-doc:: fs/block_dev.c
75-
:export:
76-
7774
.. kernel-doc:: fs/anon_inodes.c
7875
:export:
7976

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3300,7 +3300,6 @@ S: Maintained
33003300
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
33013301
F: block/
33023302
F: drivers/block/
3303-
F: fs/block_dev.c
33043303
F: include/linux/blk*
33053304
F: kernel/trace/blktrace.c
33063305
F: lib/sbitmap.c

block/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Makefile for the kernel block layer
44
#
55

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 \
77
blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
88
blk-exec.o blk-merge.o blk-timeout.o \
99
blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \

fs/block_dev.c renamed to block/bdev.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
#include <linux/cleancache.h>
2727
#include <linux/part_stat.h>
2828
#include <linux/uaccess.h>
29-
#include "internal.h"
30-
#include "../block/blk.h"
29+
#include "../fs/internal.h"
30+
#include "blk.h"
3131

3232
struct bdev_inode {
3333
struct block_device bdev;

fs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ obj-y := open.o read_write.o file_table.o super.o \
1717
kernel_read_file.o remap_range.o
1818

1919
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
2121
else
2222
obj-y += no-block.o
2323
endif

fs/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ struct user_namespace;
1818
struct pipe_inode_info;
1919

2020
/*
21-
* block_dev.c
21+
* block/bdev.c
2222
*/
2323
#ifdef CONFIG_BLOCK
2424
extern void __init bdev_cache_init(void);

0 commit comments

Comments
 (0)