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

btrfs: move BTRFS_FS_STATE* definitions and helpers to fs.h 



We're going to use fs.h to hold fs wide related helpers and definitions,
move the FS_STATE enum and related helpers to fs.h, and then update all
files that need these definitions to include fs.h.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarAnand Jain <anand.jain@oracle.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 bbde07a4

fs/btrfs/compression.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <crypto/hash.h>

#include <crypto/hash.h>

#include "misc.h"

#include "misc.h"

#include "ctree.h"

#include "ctree.h"

#include "fs.h"

#include "disk-io.h"

#include "disk-io.h"

#include "transaction.h"

#include "transaction.h"

#include "btrfs_inode.h"

#include "btrfs_inode.h"

fs/btrfs/ctree.c

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

#include "qgroup.h"

#include "tree-mod-log.h"

#include "tree-mod-log.h"

#include "tree-checker.h"

#include "tree-checker.h"

#include "fs.h"





static struct kmem_cache *btrfs_path_cachep;

static struct kmem_cache *btrfs_path_cachep;

fs/btrfs/ctree.h

+0 −46
Original line number Original line Diff line number Diff line
@@ -67,37 +67,6 @@ static inline unsigned long btrfs_chunk_item_size(int num_stripes) 
		sizeof(struct btrfs_stripe) * (num_stripes - 1);

		sizeof(struct btrfs_stripe) * (num_stripes - 1);

}

}





/*

 * Runtime (in-memory) states of filesystem

 */

enum {

	/* Global indicator of serious filesystem errors */

	BTRFS_FS_STATE_ERROR,

	/*

	 * Filesystem is being remounted, allow to skip some operations, like

	 * defrag

	 */

	BTRFS_FS_STATE_REMOUNTING,

	/* Filesystem in RO mode */

	BTRFS_FS_STATE_RO,

	/* Track if a transaction abort has been reported on this filesystem */

	BTRFS_FS_STATE_TRANS_ABORTED,

	/*

	 * Bio operations should be blocked on this filesystem because a source

	 * or target device is being destroyed as part of a device replace

	 */

	BTRFS_FS_STATE_DEV_REPLACING,

	/* The btrfs_fs_info created for self-tests */

	BTRFS_FS_STATE_DUMMY_FS_INFO,



	BTRFS_FS_STATE_NO_CSUMS,



	/* Indicates there was an error cleaning up a log tree. */

	BTRFS_FS_STATE_LOG_CLEANUP_ERROR,



	BTRFS_FS_STATE_COUNT

};



#define BTRFS_SUPER_INFO_OFFSET			SZ_64K

#define BTRFS_SUPER_INFO_OFFSET			SZ_64K

#define BTRFS_SUPER_INFO_SIZE			4096

#define BTRFS_SUPER_INFO_SIZE			4096

static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);

static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE);
@@ -3224,12 +3193,6 @@ static inline unsigned long get_eb_page_index(unsigned long offset) 
#define EXPORT_FOR_TESTS

#define EXPORT_FOR_TESTS

#endif

#endif





#define BTRFS_FS_ERROR(fs_info)	(unlikely(test_bit(BTRFS_FS_STATE_ERROR, \

						   &(fs_info)->fs_state)))

#define BTRFS_FS_LOG_CLEANUP_ERROR(fs_info)				\

	(unlikely(test_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR,		\

			   &(fs_info)->fs_state)))



/* acl.c */

/* acl.c */

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

#ifdef CONFIG_BTRFS_FS_POSIX_ACL

struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);

struct posix_acl *btrfs_get_acl(struct inode *inode, int type, bool rcu);
@@ -3327,15 +3290,6 @@ static inline int btrfs_get_verity_descriptor(struct inode *inode, void *buf, 
/* Sanity test specific functions */

/* Sanity test specific functions */

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

void btrfs_test_destroy_inode(struct inode *inode);

void btrfs_test_destroy_inode(struct inode *inode);

static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)

{

	return test_bit(BTRFS_FS_STATE_DUMMY_FS_INFO, &fs_info->fs_state);

}

#else

static inline int btrfs_is_testing(struct btrfs_fs_info *fs_info)

{

	return 0;

}

#endif

#endif





static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)

static inline bool btrfs_is_data_reloc_root(const struct btrfs_root *root)

fs/btrfs/delalloc-space.c

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

#include "transaction.h"

#include "qgroup.h"

#include "qgroup.h"

#include "block-group.h"

#include "block-group.h"

#include "fs.h"





/*

/*

 * HOW DOES THIS WORK

 * HOW DOES THIS WORK

fs/btrfs/delayed-inode.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -6,12 +6,13 @@ 




#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/iversion.h>

#include <linux/iversion.h>

#include "ctree.h"

#include "fs.h"

#include "messages.h"

#include "messages.h"

#include "misc.h"

#include "misc.h"

#include "delayed-inode.h"

#include "delayed-inode.h"

#include "disk-io.h"

#include "disk-io.h"

#include "transaction.h"

#include "transaction.h"

#include "ctree.h"

#include "qgroup.h"

#include "qgroup.h"

#include "locking.h"

#include "locking.h"

#include "inode-item.h"

#include "inode-item.h"