btrfs: move struct btrfs_dio_private to inode.c

The btrfs_dio_private structure is only used in inode.c, so move the
definition there.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h
index 14c28213ca0d3d4a162195e81adc4ccdb14b4eb4..33811e896623f0480de392dc2b82d64b1db45019 100644 (file)
--- a/fs/btrfs/btrfs_inode.h
+++ b/fs/btrfs/btrfs_inode.h
@@ -395,30 +395,6 @@ static inline bool btrfs_inode_can_compress(const struct btrfs_inode *inode)
        return true;
 }
 
-struct btrfs_dio_private {
-       struct inode *inode;
-
-       /*
-        * Since DIO can use anonymous page, we cannot use page_offset() to
-        * grab the file offset, thus need a dedicated member for file offset.
-        */
-       u64 file_offset;
-       /* Used for bio::bi_size */
-       u32 bytes;
-
-       /*
-        * References to this structure. There is one reference per in-flight
-        * bio plus one while we're still setting up.
-        */
-       refcount_t refs;
-
-       /* dio_bio came from fs/direct-io.c */
-       struct bio *dio_bio;
-
-       /* Array of checksums */
-       u8 csums[];
-};
-
 /*
  * btrfs_inode_item stores flags in a u64, btrfs_inode stores them in two
  * separate u32s. These two functions convert between the two representations.

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 47e1e79e8bfff007a85330baa8317aab1a32a90f..0e49b1a0c0716e6b94eab91599c800b26492d51a 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -3218,7 +3218,6 @@ int btrfs_del_orphan_item(struct btrfs_trans_handle *trans,
 int btrfs_find_orphan_item(struct btrfs_root *root, u64 offset);
 
 /* file-item.c */
-struct btrfs_dio_private;
 int btrfs_del_csums(struct btrfs_trans_handle *trans,
                    struct btrfs_root *root, u64 bytenr, u64 len);
 blk_status_t btrfs_lookup_bio_sums(struct inode *inode, struct bio *bio, u8 *dst);

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index ebed9eb3e5676dfbe1dff6a4ccf6ffee525a94c5..84b0a052da485bc3025340e59f63a1d8f5442e93 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -68,6 +68,30 @@ struct btrfs_dio_data {
        bool nocow_done;
 };
 
+struct btrfs_dio_private {
+       struct inode *inode;
+
+       /*
+        * Since DIO can use anonymous page, we cannot use page_offset() to
+        * grab the file offset, thus need a dedicated member for file offset.
+        */
+       u64 file_offset;
+       /* Used for bio::bi_size */
+       u32 bytes;
+
+       /*
+        * References to this structure. There is one reference per in-flight
+        * bio plus one while we're still setting up.
+        */
+       refcount_t refs;
+
+       /* dio_bio came from fs/direct-io.c */
+       struct bio *dio_bio;
+
+       /* Array of checksums */
+       u8 csums[];
+};
+
 struct btrfs_rename_ctx {
        /* Output field. Stores the index number of the old directory entry. */
        u64 index;