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

btrfs: move mount option definitions to fs.h 



These are fs wide definitions and helpers, move them out of ctree.h and
into 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 0d3a9cf8

fs/btrfs/block-rsv.c

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

#include "transaction.h"

#include "block-group.h"

#include "block-group.h"

#include "disk-io.h"

#include "disk-io.h"

#include "fs.h"





/*

/*

 * HOW DO BLOCK RESERVES WORK

 * HOW DO BLOCK RESERVES WORK

fs/btrfs/ctree.h

+0 −63
Original line number Original line Diff line number Diff line
@@ -1328,69 +1328,6 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(const struct btrfs_fs_info *info) 
	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

	return BTRFS_MAX_ITEM_SIZE(info) - sizeof(struct btrfs_dir_item);

}

}





/*

 * Flags for mount options.

 *

 * Note: don't forget to add new options to btrfs_show_options()

 */

enum {

	BTRFS_MOUNT_NODATASUM			= (1UL << 0),

	BTRFS_MOUNT_NODATACOW			= (1UL << 1),

	BTRFS_MOUNT_NOBARRIER			= (1UL << 2),

	BTRFS_MOUNT_SSD				= (1UL << 3),

	BTRFS_MOUNT_DEGRADED			= (1UL << 4),

	BTRFS_MOUNT_COMPRESS			= (1UL << 5),

	BTRFS_MOUNT_NOTREELOG   		= (1UL << 6),

	BTRFS_MOUNT_FLUSHONCOMMIT		= (1UL << 7),

	BTRFS_MOUNT_SSD_SPREAD			= (1UL << 8),

	BTRFS_MOUNT_NOSSD			= (1UL << 9),

	BTRFS_MOUNT_DISCARD_SYNC		= (1UL << 10),

	BTRFS_MOUNT_FORCE_COMPRESS      	= (1UL << 11),

	BTRFS_MOUNT_SPACE_CACHE			= (1UL << 12),

	BTRFS_MOUNT_CLEAR_CACHE			= (1UL << 13),

	BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED	= (1UL << 14),

	BTRFS_MOUNT_ENOSPC_DEBUG		= (1UL << 15),

	BTRFS_MOUNT_AUTO_DEFRAG			= (1UL << 16),

	BTRFS_MOUNT_USEBACKUPROOT		= (1UL << 17),

	BTRFS_MOUNT_SKIP_BALANCE		= (1UL << 18),

	BTRFS_MOUNT_CHECK_INTEGRITY		= (1UL << 19),

	BTRFS_MOUNT_CHECK_INTEGRITY_DATA	= (1UL << 20),

	BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	= (1UL << 21),

	BTRFS_MOUNT_RESCAN_UUID_TREE		= (1UL << 22),

	BTRFS_MOUNT_FRAGMENT_DATA		= (1UL << 23),

	BTRFS_MOUNT_FRAGMENT_METADATA		= (1UL << 24),

	BTRFS_MOUNT_FREE_SPACE_TREE		= (1UL << 25),

	BTRFS_MOUNT_NOLOGREPLAY			= (1UL << 26),

	BTRFS_MOUNT_REF_VERIFY			= (1UL << 27),

	BTRFS_MOUNT_DISCARD_ASYNC		= (1UL << 28),

	BTRFS_MOUNT_IGNOREBADROOTS		= (1UL << 29),

	BTRFS_MOUNT_IGNOREDATACSUMS		= (1UL << 30),

	BTRFS_MOUNT_NODISCARD			= (1UL << 31),

};



#define BTRFS_DEFAULT_COMMIT_INTERVAL	(30)

#define BTRFS_DEFAULT_MAX_INLINE	(2048)



#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)

#define btrfs_raw_test_opt(o, opt)	((o) & BTRFS_MOUNT_##opt)

#define btrfs_test_opt(fs_info, opt)	((fs_info)->mount_opt & \

					 BTRFS_MOUNT_##opt)



#define btrfs_set_and_info(fs_info, opt, fmt, args...)			\

do {									\

	if (!btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_set_opt(fs_info->mount_opt, opt);				\

} while (0)



#define btrfs_clear_and_info(fs_info, opt, fmt, args...)		\

do {									\

	if (btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_clear_opt(fs_info->mount_opt, opt);			\

} while (0)



/*

/*

 * Requests for changes that need to be done during transaction commit.

 * Requests for changes that need to be done during transaction commit.

 *

 *

fs/btrfs/delayed-ref.c

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

#include "qgroup.h"

#include "space-info.h"

#include "space-info.h"

#include "tree-mod-log.h"

#include "tree-mod-log.h"

#include "fs.h"





struct kmem_cache *btrfs_delayed_ref_head_cachep;

struct kmem_cache *btrfs_delayed_ref_head_cachep;

struct kmem_cache *btrfs_delayed_tree_ref_cachep;

struct kmem_cache *btrfs_delayed_tree_ref_cachep;

fs/btrfs/discard.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "block-group.h"

#include "block-group.h"

#include "discard.h"

#include "discard.h"

#include "free-space-cache.h"

#include "free-space-cache.h"

#include "fs.h"





/*

/*

 * This contains the logic to handle async discard.

 * This contains the logic to handle async discard.

fs/btrfs/fs.h

+63 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,49 @@ enum { 
	BTRFS_FS_STATE_COUNT

	BTRFS_FS_STATE_COUNT

};

};





/*

 * Flags for mount options.

 *

 * Note: don't forget to add new options to btrfs_show_options()

 */

enum {

	BTRFS_MOUNT_NODATASUM			= (1UL << 0),

	BTRFS_MOUNT_NODATACOW			= (1UL << 1),

	BTRFS_MOUNT_NOBARRIER			= (1UL << 2),

	BTRFS_MOUNT_SSD				= (1UL << 3),

	BTRFS_MOUNT_DEGRADED			= (1UL << 4),

	BTRFS_MOUNT_COMPRESS			= (1UL << 5),

	BTRFS_MOUNT_NOTREELOG   		= (1UL << 6),

	BTRFS_MOUNT_FLUSHONCOMMIT		= (1UL << 7),

	BTRFS_MOUNT_SSD_SPREAD			= (1UL << 8),

	BTRFS_MOUNT_NOSSD			= (1UL << 9),

	BTRFS_MOUNT_DISCARD_SYNC		= (1UL << 10),

	BTRFS_MOUNT_FORCE_COMPRESS      	= (1UL << 11),

	BTRFS_MOUNT_SPACE_CACHE			= (1UL << 12),

	BTRFS_MOUNT_CLEAR_CACHE			= (1UL << 13),

	BTRFS_MOUNT_USER_SUBVOL_RM_ALLOWED	= (1UL << 14),

	BTRFS_MOUNT_ENOSPC_DEBUG		= (1UL << 15),

	BTRFS_MOUNT_AUTO_DEFRAG			= (1UL << 16),

	BTRFS_MOUNT_USEBACKUPROOT		= (1UL << 17),

	BTRFS_MOUNT_SKIP_BALANCE		= (1UL << 18),

	BTRFS_MOUNT_CHECK_INTEGRITY		= (1UL << 19),

	BTRFS_MOUNT_CHECK_INTEGRITY_DATA	= (1UL << 20),

	BTRFS_MOUNT_PANIC_ON_FATAL_ERROR	= (1UL << 21),

	BTRFS_MOUNT_RESCAN_UUID_TREE		= (1UL << 22),

	BTRFS_MOUNT_FRAGMENT_DATA		= (1UL << 23),

	BTRFS_MOUNT_FRAGMENT_METADATA		= (1UL << 24),

	BTRFS_MOUNT_FREE_SPACE_TREE		= (1UL << 25),

	BTRFS_MOUNT_NOLOGREPLAY			= (1UL << 26),

	BTRFS_MOUNT_REF_VERIFY			= (1UL << 27),

	BTRFS_MOUNT_DISCARD_ASYNC		= (1UL << 28),

	BTRFS_MOUNT_IGNOREBADROOTS		= (1UL << 29),

	BTRFS_MOUNT_IGNOREDATACSUMS		= (1UL << 30),

	BTRFS_MOUNT_NODISCARD			= (1UL << 31),

};



#define BTRFS_DEFAULT_COMMIT_INTERVAL	(30)

#define BTRFS_DEFAULT_MAX_INLINE	(2048)



/* Compatibility and incompatibility defines */

/* Compatibility and incompatibility defines */

void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,

void __btrfs_set_fs_incompat(struct btrfs_fs_info *fs_info, u64 flag,

			     const char *name);

			     const char *name);
@@ -68,6 +111,26 @@ void __btrfs_clear_fs_compat_ro(struct btrfs_fs_info *fs_info, u64 flag, 
#define btrfs_fs_compat_ro(fs_info, opt)				\

#define btrfs_fs_compat_ro(fs_info, opt)				\

	__btrfs_fs_compat_ro((fs_info), BTRFS_FEATURE_COMPAT_RO_##opt)

	__btrfs_fs_compat_ro((fs_info), BTRFS_FEATURE_COMPAT_RO_##opt)





#define btrfs_clear_opt(o, opt)		((o) &= ~BTRFS_MOUNT_##opt)

#define btrfs_set_opt(o, opt)		((o) |= BTRFS_MOUNT_##opt)

#define btrfs_raw_test_opt(o, opt)	((o) & BTRFS_MOUNT_##opt)

#define btrfs_test_opt(fs_info, opt)	((fs_info)->mount_opt & \

					 BTRFS_MOUNT_##opt)



#define btrfs_set_and_info(fs_info, opt, fmt, args...)			\

do {									\

	if (!btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_set_opt(fs_info->mount_opt, opt);				\

} while (0)



#define btrfs_clear_and_info(fs_info, opt, fmt, args...)		\

do {									\

	if (btrfs_test_opt(fs_info, opt))				\

		btrfs_info(fs_info, fmt, ##args);			\

	btrfs_clear_opt(fs_info->mount_opt, opt);			\

} while (0)



static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)

static inline int btrfs_fs_closing(struct btrfs_fs_info *fs_info)

{

{

	/* Do it this way so we only ever do one test_bit in the normal case. */

	/* Do it this way so we only ever do one test_bit in the normal case. */