Commit 59b818e0 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: move defrag related prototypes to their own header 



Now that the defrag code is all in one file, create a defrag.h and move
all the defrag related prototypes and helper out of ctree.h and into
defrag.h.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent a6a01ca6

fs/btrfs/ctree.h

+0 −18
Original line number Diff line number Diff line
@@ -773,19 +773,10 @@ int btrfs_fileattr_set(struct user_namespace *mnt_userns, 
int btrfs_ioctl_get_supported_features(void __user *arg);

void btrfs_sync_inode_flags_to_i_flags(struct inode *inode);

int __pure btrfs_is_empty_uuid(u8 *uuid);

int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,

		      struct btrfs_ioctl_defrag_range_args *range,

		      u64 newer_than, unsigned long max_to_defrag);

void btrfs_update_ioctl_balance_args(struct btrfs_fs_info *fs_info,

			       struct btrfs_ioctl_balance_args *bargs);



/* file.c */

int __init btrfs_auto_defrag_init(void);

void __cold btrfs_auto_defrag_exit(void);

int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

			   struct btrfs_inode *inode, u32 extent_thresh);

int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);

void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);

int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync);

extern const struct file_operations btrfs_file_operations;

int btrfs_drop_extents(struct btrfs_trans_handle *trans,
@@ -811,10 +802,6 @@ void btrfs_check_nocow_unlock(struct btrfs_inode *inode); 
bool btrfs_find_delalloc_in_range(struct btrfs_inode *inode, u64 start, u64 end,

				  u64 *delalloc_start_ret, u64 *delalloc_end_ret);



/* tree-defrag.c */

int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,

			struct btrfs_root *root);



/* super.c */

int btrfs_parse_options(struct btrfs_fs_info *info, char *options,

			unsigned long new_flags);
@@ -945,11 +932,6 @@ static inline int is_fstree(u64 rootid) 
	return 0;

}



static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)

{

	return signal_pending(current);

}



/* verity.c */

#ifdef CONFIG_FS_VERITY

fs/btrfs/defrag.c

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include "messages.h"

#include "delalloc-space.h"

#include "subpage.h"

#include "defrag.h"



static struct kmem_cache *btrfs_inode_defrag_cachep;

fs/btrfs/defrag.h

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifndef BTRFS_DEFRAG_H

#define BTRFS_DEFRAG_H



int btrfs_defrag_file(struct inode *inode, struct file_ra_state *ra,

		      struct btrfs_ioctl_defrag_range_args *range,

		      u64 newer_than, unsigned long max_to_defrag);

int __init btrfs_auto_defrag_init(void);

void __cold btrfs_auto_defrag_exit(void);

int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,

			   struct btrfs_inode *inode, u32 extent_thresh);

int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info);

void btrfs_cleanup_defrag_inodes(struct btrfs_fs_info *fs_info);

int btrfs_defrag_leaves(struct btrfs_trans_handle *trans, struct btrfs_root *root);



static inline int btrfs_defrag_cancelled(struct btrfs_fs_info *fs_info)

{

	return signal_pending(current);

}



#endif

fs/btrfs/disk-io.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "accessors.h"

#include "extent-tree.h"

#include "root-tree.h"

#include "defrag.h"



#define BTRFS_SUPER_FLAG_SUPP	(BTRFS_HEADER_FLAG_WRITTEN |\

				 BTRFS_HEADER_FLAG_RELOC |\

fs/btrfs/inode.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#include "accessors.h"

#include "extent-tree.h"

#include "root-tree.h"

#include "defrag.h"



struct btrfs_iget_args {

	u64 ino;