loop: remove loop.h

Merge loop.h into loop.c as all the content is only used there.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20220419063303.583106-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 322d92f..533294a 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -59,7 +59,6 @@
 #include <linux/errno.h>
 #include <linux/major.h>
 #include <linux/wait.h>
-#include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/init.h>
 #include <linux/swap.h>
@@ -80,10 +79,62 @@
 #include <linux/blk-cgroup.h>
 #include <linux/sched/mm.h>
 #include <linux/statfs.h>
+#include <linux/uaccess.h>
+#include <linux/blk-mq.h>
+#include <linux/spinlock.h>
+#include <uapi/linux/loop.h>
+
+/* Possible states of device */
+enum {
+       Lo_unbound,
+       Lo_bound,
+       Lo_rundown,
+       Lo_deleting,
+};
 
-#include "loop.h"
+struct loop_func_table;
+
+struct loop_device {
+       int             lo_number;
+       loff_t          lo_offset;
+       loff_t          lo_sizelimit;
+       int             lo_flags;
+       char            lo_file_name[LO_NAME_SIZE];
+
+       struct file *   lo_backing_file;
+       struct block_device *lo_device;
+
+       gfp_t           old_gfp_mask;
+
+       spinlock_t              lo_lock;
+       int                     lo_state;
+       spinlock_t              lo_work_lock;
+       struct workqueue_struct *workqueue;
+       struct work_struct      rootcg_work;
+       struct list_head        rootcg_cmd_list;
+       struct list_head        idle_worker_list;
+       struct rb_root          worker_tree;
+       struct timer_list       timer;
+       bool                    use_dio;
+       bool                    sysfs_inited;
+
+       struct request_queue    *lo_queue;
+       struct blk_mq_tag_set   tag_set;
+       struct gendisk          *lo_disk;
+       struct mutex            lo_mutex;
+       bool                    idr_visible;
+};
 
-#include <linux/uaccess.h>
+struct loop_cmd {
+       struct list_head list_entry;
+       bool use_aio; /* use AIO interface to handle I/O */
+       atomic_t ref; /* only for aio */
+       long ret;
+       struct kiocb iocb;
+       struct bio_vec *bvec;
+       struct cgroup_subsys_state *blkcg_css;
+       struct cgroup_subsys_state *memcg_css;
+};
 
 #define LOOP_IDLE_WORKER_TIMEOUT (60 * HZ)
 #define LOOP_DEFAULT_HW_Q_DEPTH (128)

diff --git a/drivers/block/loop.h b/drivers/block/loop.h
deleted file mode 100644 (file)
index 449d562..0000000
--- a/drivers/block/loop.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * loop.h
- *
- * Written by Theodore Ts'o, 3/29/93.
- *
- * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
- * permitted under the GNU General Public License.
- */
-#ifndef _LINUX_LOOP_H
-#define _LINUX_LOOP_H
-
-#include <linux/bio.h>
-#include <linux/blkdev.h>
-#include <linux/blk-mq.h>
-#include <linux/spinlock.h>
-#include <linux/mutex.h>
-#include <uapi/linux/loop.h>
-
-/* Possible states of device */
-enum {
-       Lo_unbound,
-       Lo_bound,
-       Lo_rundown,
-       Lo_deleting,
-};
-
-struct loop_func_table;
-
-struct loop_device {
-       int             lo_number;
-       loff_t          lo_offset;
-       loff_t          lo_sizelimit;
-       int             lo_flags;
-       char            lo_file_name[LO_NAME_SIZE];
-
-       struct file *   lo_backing_file;
-       struct block_device *lo_device;
-
-       gfp_t           old_gfp_mask;
-
-       spinlock_t              lo_lock;
-       int                     lo_state;
-       spinlock_t              lo_work_lock;
-       struct workqueue_struct *workqueue;
-       struct work_struct      rootcg_work;
-       struct list_head        rootcg_cmd_list;
-       struct list_head        idle_worker_list;
-       struct rb_root          worker_tree;
-       struct timer_list       timer;
-       bool                    use_dio;
-       bool                    sysfs_inited;
-
-       struct request_queue    *lo_queue;
-       struct blk_mq_tag_set   tag_set;
-       struct gendisk          *lo_disk;
-       struct mutex            lo_mutex;
-       bool                    idr_visible;
-};
-
-struct loop_cmd {
-       struct list_head list_entry;
-       bool use_aio; /* use AIO interface to handle I/O */
-       atomic_t ref; /* only for aio */
-       long ret;
-       struct kiocb iocb;
-       struct bio_vec *bvec;
-       struct cgroup_subsys_state *blkcg_css;
-       struct cgroup_subsys_state *memcg_css;
-};
-
-#endif