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 <hch@lst.de>

diff --git a/Documentation/core-api/kernel-api.rst b/Documentation/core-api/kernel-api.rst
index 2a7444e3a4c217664421d78349d5b5e33aced4a9..2e718680514802ac4843303ec0be634f9a8970ce 100644 (file)
--- 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 7e5c04c9861984dd022edda99e2ef142e60c2cdc..98db2ea5fa12c652a3f02bd6ac7cc3d6811e3551 100644 (file)
--- 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 2f298429a5e92470bd1dffc172192bf24543a67e..46227e43e0b154b773c08423809bb120e8ad8804 100644 (file)
--- 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 a4d8d149670bf49679dbce2f2e7632e4b969a193..c03b92d8a4bc59c5db7b23ac91b3ffbf20feb779 100644 (file)
--- 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 84c97e27604745b27d323096f1103b6fd7867b9a..cf2780cb44a74fddb4624aecb22161203b62d6b7 100644 (file)
--- 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 354e2ba3ee67df7c6c2e7393308277dd5a10281a..a1b89b1dc8fcd39bc1b51bd38cae5d0ecaa3cc24 100644 (file)
--- 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 68a2ae029a27f4b49458eae473962ff172bec5e6..3cd065c8a66b4ceb99d255f4c0fa82314fa218d9 100644 (file)
--- 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);