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

btrfs: move space_info to space-info.h 



Migrate the struct definition and the one helper that's in ctree.h into
space-info.h

Reviewed-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e749af44

fs/btrfs/ctree.h

+1 −72
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct btrfs_trans_handle; 
struct btrfs_transaction;

struct btrfs_pending_snapshot;

struct btrfs_delayed_ref_root;

struct btrfs_space_info;

extern struct kmem_cache *btrfs_trans_handle_cachep;

extern struct kmem_cache *btrfs_bit_radix_cachep;

extern struct kmem_cache *btrfs_path_cachep;
@@ -402,72 +403,6 @@ struct raid_kobject { 
	struct list_head list;

};



struct btrfs_space_info {

	spinlock_t lock;



	u64 total_bytes;	/* total bytes in the space,

				   this doesn't take mirrors into account */

	u64 bytes_used;		/* total bytes used,

				   this doesn't take mirrors into account */

	u64 bytes_pinned;	/* total bytes pinned, will be freed when the

				   transaction finishes */

	u64 bytes_reserved;	/* total bytes the allocator has reserved for

				   current allocations */

	u64 bytes_may_use;	/* number of bytes that may be used for

				   delalloc/allocations */

	u64 bytes_readonly;	/* total bytes that are read only */



	u64 max_extent_size;	/* This will hold the maximum extent size of

				   the space info if we had an ENOSPC in the

				   allocator. */



	unsigned int full:1;	/* indicates that we cannot allocate any more

				   chunks for this space */

	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */



	unsigned int flush:1;		/* set if we are trying to make space */



	unsigned int force_alloc;	/* set if we need to force a chunk

					   alloc for this space */



	u64 disk_used;		/* total bytes used on disk */

	u64 disk_total;		/* total bytes on disk, takes mirrors into

				   account */



	u64 flags;



	/*

	 * bytes_pinned is kept in line with what is actually pinned, as in

	 * we've called update_block_group and dropped the bytes_used counter

	 * and increased the bytes_pinned counter.  However this means that

	 * bytes_pinned does not reflect the bytes that will be pinned once the

	 * delayed refs are flushed, so this counter is inc'ed every time we

	 * call btrfs_free_extent so it is a realtime count of what will be

	 * freed once the transaction is committed.  It will be zeroed every

	 * time the transaction commits.

	 */

	struct percpu_counter total_bytes_pinned;



	struct list_head list;

	/* Protected by the spinlock 'lock'. */

	struct list_head ro_bgs;

	struct list_head priority_tickets;

	struct list_head tickets;

	/*

	 * tickets_id just indicates the next ticket will be handled, so note

	 * it's not stored per ticket.

	 */

	u64 tickets_id;



	struct rw_semaphore groups_sem;

	/* for block groups in our same type */

	struct list_head block_groups[BTRFS_NR_RAID_TYPES];

	wait_queue_head_t wait;



	struct kobject kobj;

	struct kobject *block_group_kobjs[BTRFS_NR_RAID_TYPES];

};



/*

 * Types of block reserves

 */
@@ -2693,12 +2628,6 @@ static inline u64 btrfs_extref_hash(u64 parent_objectid, const char *name, 
       return (u64) crc32c(parent_objectid, name, len);

}



static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)

{

	return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&

		(space_info->flags & BTRFS_BLOCK_GROUP_DATA));

}



static inline gfp_t btrfs_alloc_write_mask(struct address_space *mapping)

{

	return mapping_gfp_constraint(mapping, ~__GFP_FS);

fs/btrfs/extent-tree.c

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

#include "qgroup.h"

#include "ref-verify.h"

#include "space-info.h"



#undef SCRAMBLE_DELAYED_REFS

fs/btrfs/free-space-cache.c

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

#include "inode-map.h"

#include "volumes.h"

#include "space-info.h"



#define BITS_PER_BITMAP		(PAGE_SIZE * 8UL)

#define MAX_CACHE_BYTES_PER_GIG	SZ_32K

fs/btrfs/ioctl.c

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

#include "tree-log.h"

#include "compression.h"

#include "space-info.h"



#ifdef CONFIG_64BIT

/* If we have a 32-bit userspace and 64-bit kernel, then the UAPI

fs/btrfs/space-info.h

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



#ifndef BTRFS_SPACE_INFO_H

#define BTRFS_SPACE_INFO_H



struct btrfs_space_info {

	spinlock_t lock;



	u64 total_bytes;	/* total bytes in the space,

				   this doesn't take mirrors into account */

	u64 bytes_used;		/* total bytes used,

				   this doesn't take mirrors into account */

	u64 bytes_pinned;	/* total bytes pinned, will be freed when the

				   transaction finishes */

	u64 bytes_reserved;	/* total bytes the allocator has reserved for

				   current allocations */

	u64 bytes_may_use;	/* number of bytes that may be used for

				   delalloc/allocations */

	u64 bytes_readonly;	/* total bytes that are read only */



	u64 max_extent_size;	/* This will hold the maximum extent size of

				   the space info if we had an ENOSPC in the

				   allocator. */



	unsigned int full:1;	/* indicates that we cannot allocate any more

				   chunks for this space */

	unsigned int chunk_alloc:1;	/* set if we are allocating a chunk */



	unsigned int flush:1;		/* set if we are trying to make space */



	unsigned int force_alloc;	/* set if we need to force a chunk

					   alloc for this space */



	u64 disk_used;		/* total bytes used on disk */

	u64 disk_total;		/* total bytes on disk, takes mirrors into

				   account */



	u64 flags;



	/*

	 * bytes_pinned is kept in line with what is actually pinned, as in

	 * we've called update_block_group and dropped the bytes_used counter

	 * and increased the bytes_pinned counter.  However this means that

	 * bytes_pinned does not reflect the bytes that will be pinned once the

	 * delayed refs are flushed, so this counter is inc'ed every time we

	 * call btrfs_free_extent so it is a realtime count of what will be

	 * freed once the transaction is committed.  It will be zeroed every

	 * time the transaction commits.

	 */

	struct percpu_counter total_bytes_pinned;



	struct list_head list;

	/* Protected by the spinlock 'lock'. */

	struct list_head ro_bgs;

	struct list_head priority_tickets;

	struct list_head tickets;

	/*

	 * tickets_id just indicates the next ticket will be handled, so note

	 * it's not stored per ticket.

	 */

	u64 tickets_id;



	struct rw_semaphore groups_sem;

	/* for block groups in our same type */

	struct list_head block_groups[BTRFS_NR_RAID_TYPES];

	wait_queue_head_t wait;



	struct kobject kobj;

	struct kobject *block_group_kobjs[BTRFS_NR_RAID_TYPES];

};



static inline bool btrfs_mixed_space_info(struct btrfs_space_info *space_info)

{

	return ((space_info->flags & BTRFS_BLOCK_GROUP_METADATA) &&

		(space_info->flags & BTRFS_BLOCK_GROUP_DATA));

}



#endif /* BTRFS_SPACE_INFO_H */