Skip to content

Commit

Permalink
block: move fs/block_dev.c to block/bdev.c
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
Christoph Hellwig authored and axboe committed Sep 7, 2021
1 parent cd82cca commit 0dca446
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
3 changes: 3 additions & 0 deletions Documentation/core-api/kernel-api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,9 @@ Block Devices
.. kernel-doc:: block/genhd.c
:export:

.. kernel-doc:: block/bdev.c
:export:

Char devices
============

Expand Down
3 changes: 0 additions & 3 deletions Documentation/filesystems/api-summary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ Other Functions
.. kernel-doc:: fs/fs-writeback.c
:export:

.. kernel-doc:: fs/block_dev.c
:export:

.. kernel-doc:: fs/anon_inodes.c
:export:

Expand Down
1 change: 0 additions & 1 deletion MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3300,7 +3300,6 @@ S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
F: block/
F: drivers/block/
F: fs/block_dev.c
F: include/linux/blk*
F: kernel/trace/blktrace.c
F: lib/sbitmap.c
Expand Down
2 changes: 1 addition & 1 deletion block/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Makefile for the kernel block layer
#

obj-$(CONFIG_BLOCK) := fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
obj-$(CONFIG_BLOCK) := bdev.o fops.o bio.o elevator.o blk-core.o blk-sysfs.o \
blk-flush.o blk-settings.o blk-ioc.o blk-map.o \
blk-exec.o blk-merge.o blk-timeout.o \
blk-lib.o blk-mq.o blk-mq-tag.o blk-stat.o \
Expand Down
4 changes: 2 additions & 2 deletions fs/block_dev.c → block/bdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#include <linux/cleancache.h>
#include <linux/part_stat.h>
#include <linux/uaccess.h>
#include "internal.h"
#include "../block/blk.h"
#include "../fs/internal.h"
#include "blk.h"

struct bdev_inode {
struct block_device bdev;
Expand Down
2 changes: 1 addition & 1 deletion fs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ obj-y := open.o read_write.o file_table.o super.o \
kernel_read_file.o remap_range.o

ifeq ($(CONFIG_BLOCK),y)
obj-y += buffer.o block_dev.o direct-io.o mpage.o
obj-y += buffer.o direct-io.o mpage.o
else
obj-y += no-block.o
endif
Expand Down
2 changes: 1 addition & 1 deletion fs/internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ struct user_namespace;
struct pipe_inode_info;

/*
* block_dev.c
* block/bdev.c
*/
#ifdef CONFIG_BLOCK
extern void __init bdev_cache_init(void);
Expand Down

0 comments on commit 0dca446

Please sign in to comment.