[2/2] block: move fs/block_dev.c to block/bdev.c

Commit Message

Christoph Hellwig Sept. 7, 2021, 2:13 p.m. UTC

Move it together with the rest of the block layer.

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 Documentation/core-api/kernel-api.rst     | 3 +++
 Documentation/filesystems/api-summary.rst | 3 ---
 MAINTAINERS                               | 1 -
 block/Makefile                            | 2 +-
 fs/block_dev.c => block/bdev.c            | 4 ++--
 fs/Makefile                               | 2 +-
 fs/internal.h                             | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename fs/block_dev.c => block/bdev.c (99%)

Comments

Chaitanya Kulkarni Sept. 7, 2021, 6:36 p.m. UTC | #1

On 9/7/21 7:13 AM, Christoph Hellwig wrote:
> Move it together with the rest of the block layer.
> 
> Signed-off-by: Christoph Hellwig <[e-mail]>
>

Looks good.

Reviewed-by: Chaitanya Kulkarni <[e-mail]>

Patch

diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst
index 2a7444e3a4c21..2e71868051480 100644
--- a/Documentation/core-api/kernel-api.rst
+++ b/Documentation/core-api/kernel-api.rst
@@ -315,6 +315,9 @@  Block Devices
 .. kernel-doc:: block/genhd.c
    :export:
 
+.. kernel-doc:: block/bdev.c
+   :export:
+
 Char devices
 ============
 
diff --git a/Documentation/filesystems/api-summary.rst b/Documentation/filesystems/api-summary.rst
index 7e5c04c986198..98db2ea5fa12c 100644
--- a/Documentation/filesystems/api-summary.rst
+++ b/Documentation/filesystems/api-summary.rst
@@ -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:
 
diff --git a/MAINTAINERS b/MAINTAINERS
index 2f298429a5e92..46227e43e0b15 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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
diff --git a/block/Makefile b/block/Makefile
index a4d8d149670bf..c03b92d8a4bc5 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -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 \
diff --git a/fs/block_dev.c b/block/bdev.c
similarity index 99%
rename from fs/block_dev.c
rename to block/bdev.c
index 84c97e2760474..cf2780cb44a74 100644
--- a/fs/block_dev.c
+++ b/block/bdev.c
@@ -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;
diff --git a/fs/Makefile b/fs/Makefile
index 354e2ba3ee67d..a1b89b1dc8fcd 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -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
diff --git a/fs/internal.h b/fs/internal.h
index 68a2ae029a27f..3cd065c8a66b4 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -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);