Commit a3e171a0 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

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: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent acb8b52a

fs/btrfs/btrfs_inode.h

+0 −24
Original line number Diff line number Diff line
@@ -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.

fs/btrfs/ctree.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

fs/btrfs/inode.c

+24 −0
Original line number Diff line number Diff line
@@ -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;