Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72ac3c0d authored by Josef Bacik's avatar Josef Bacik
Browse files

Btrfs: convert the inode bit field to use the actual bit operations 



Miao pointed this out while I was working on an orphan problem that messing
with a bitfield where different ranges are protected by different locks
doesn't work out right.  Turns out we've been doing this forever where we
have different parts of the bit field protected by either no lock at all or
different locks which could cause all sorts of weird problems including the
issue I was hitting.  So instead make a runtime_flags thing that we use the
normal bit operations on that are all atomic so we can keep having our
no/different locking for the different flags and then make force_compress
it's own thing so it can be treated normally.  Thanks,

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent cd023e7b

fs/btrfs/btrfs_inode.h

+16 −14
Original line number Diff line number Diff line
@@ -24,6 +24,19 @@ 
#include "ordered-data.h"

#include "delayed-inode.h"



/*

 * ordered_data_close is set by truncate when a file that used

 * to have good data has been truncated to zero.  When it is set

 * the btrfs file release call will add this inode to the

 * ordered operations list so that we make sure to flush out any

 * new data the application may have written before commit.

 */

#define BTRFS_INODE_ORDERED_DATA_CLOSE		0

#define BTRFS_INODE_ORPHAN_META_RESERVED	1

#define BTRFS_INODE_DUMMY			2

#define BTRFS_INODE_IN_DEFRAG			3

#define BTRFS_INODE_DELALLOC_META_RESERVED	4



/* in memory btrfs inode */

struct btrfs_inode {

	/* which subvolume this inode belongs to */
@@ -78,6 +91,8 @@ struct btrfs_inode { 
	/* the space_info for where this inode's data allocations are done */

	struct btrfs_space_info *space_info;



	unsigned long runtime_flags;



	/* full 64 bit generation number, struct vfs_inode doesn't have a big

	 * enough field for this.

	 */
@@ -141,23 +156,10 @@ struct btrfs_inode { 
	unsigned outstanding_extents;

	unsigned reserved_extents;



	/*

	 * ordered_data_close is set by truncate when a file that used

	 * to have good data has been truncated to zero.  When it is set

	 * the btrfs file release call will add this inode to the

	 * ordered operations list so that we make sure to flush out any

	 * new data the application may have written before commit.

	 */

	unsigned ordered_data_close:1;

	unsigned orphan_meta_reserved:1;

	unsigned dummy_inode:1;

	unsigned in_defrag:1;

	unsigned delalloc_meta_reserved:1;



	/*

	 * always compress this one file

	 */

	unsigned force_compress:4;

	unsigned force_compress;



	struct btrfs_delayed_node *delayed_node;

fs/btrfs/delayed-inode.c

+2 −2
Original line number Diff line number Diff line
@@ -669,8 +669,8 @@ static int btrfs_delayed_inode_reserve_metadata( 
		return ret;

	} else if (src_rsv == &root->fs_info->delalloc_block_rsv) {

		spin_lock(&BTRFS_I(inode)->lock);

		if (BTRFS_I(inode)->delalloc_meta_reserved) {

			BTRFS_I(inode)->delalloc_meta_reserved = 0;

		if (test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,

				       &BTRFS_I(inode)->runtime_flags)) {

			spin_unlock(&BTRFS_I(inode)->lock);

			release = true;

			goto migrate;

fs/btrfs/disk-io.c

+2 −1
Original line number Diff line number Diff line
@@ -2001,7 +2001,8 @@ int open_ctree(struct super_block *sb, 
	BTRFS_I(fs_info->btree_inode)->root = tree_root;

	memset(&BTRFS_I(fs_info->btree_inode)->location, 0,

	       sizeof(struct btrfs_key));

	BTRFS_I(fs_info->btree_inode)->dummy_inode = 1;

	set_bit(BTRFS_INODE_DUMMY,

		&BTRFS_I(fs_info->btree_inode)->runtime_flags);

	insert_inode_hash(fs_info->btree_inode);



	spin_lock_init(&fs_info->block_group_cache_lock);

fs/btrfs/extent-tree.c

+6 −5
Original line number Diff line number Diff line
@@ -4355,10 +4355,9 @@ static unsigned drop_outstanding_extent(struct inode *inode) 
	BTRFS_I(inode)->outstanding_extents--;



	if (BTRFS_I(inode)->outstanding_extents == 0 &&

	    BTRFS_I(inode)->delalloc_meta_reserved) {

	    test_and_clear_bit(BTRFS_INODE_DELALLOC_META_RESERVED,

			       &BTRFS_I(inode)->runtime_flags))

		drop_inode_space = 1;

		BTRFS_I(inode)->delalloc_meta_reserved = 0;

	}



	/*

	 * If we have more or the same amount of outsanding extents than we have
@@ -4465,7 +4464,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes) 
	 * Add an item to reserve for updating the inode when we complete the

	 * delalloc io.

	 */

	if (!BTRFS_I(inode)->delalloc_meta_reserved) {

	if (!test_bit(BTRFS_INODE_DELALLOC_META_RESERVED,

		      &BTRFS_I(inode)->runtime_flags)) {

		nr_extents++;

		extra_reserve = 1;

	}
@@ -4511,7 +4511,8 @@ int btrfs_delalloc_reserve_metadata(struct inode *inode, u64 num_bytes) 


	spin_lock(&BTRFS_I(inode)->lock);

	if (extra_reserve) {

		BTRFS_I(inode)->delalloc_meta_reserved = 1;

		set_bit(BTRFS_INODE_DELALLOC_META_RESERVED,

			&BTRFS_I(inode)->runtime_flags);

		nr_extents--;

	}

	BTRFS_I(inode)->reserved_extents += nr_extents;

fs/btrfs/file.c

+6 −6
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void __btrfs_add_inode_defrag(struct inode *inode, 
			goto exists;

		}

	}

	BTRFS_I(inode)->in_defrag = 1;

	set_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags);

	rb_link_node(&defrag->rb_node, parent, p);

	rb_insert_color(&defrag->rb_node, &root->fs_info->defrag_inodes);

	return;
@@ -131,7 +131,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 
	if (btrfs_fs_closing(root->fs_info))

		return 0;



	if (BTRFS_I(inode)->in_defrag)

	if (test_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags))

		return 0;



	if (trans)
@@ -148,7 +148,7 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans, 
	defrag->root = root->root_key.objectid;



	spin_lock(&root->fs_info->defrag_inodes_lock);

	if (!BTRFS_I(inode)->in_defrag)

	if (!test_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags))

		__btrfs_add_inode_defrag(inode, defrag);

	else

		kfree(defrag);
@@ -252,7 +252,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info) 
			goto next;



		/* do a chunk of defrag */

		BTRFS_I(inode)->in_defrag = 0;

		clear_bit(BTRFS_INODE_IN_DEFRAG, &BTRFS_I(inode)->runtime_flags);

		range.start = defrag->last_offset;

		num_defrag = btrfs_defrag_file(inode, NULL, &range, defrag->transid,

					       defrag_batch);
@@ -1465,8 +1465,8 @@ int btrfs_release_file(struct inode *inode, struct file *filp) 
	 * flush down new bytes that may have been written if the

	 * application were using truncate to replace a file in place.

	 */

	if (BTRFS_I(inode)->ordered_data_close) {

		BTRFS_I(inode)->ordered_data_close = 0;

	if (test_and_clear_bit(BTRFS_INODE_ORDERED_DATA_CLOSE,

			       &BTRFS_I(inode)->runtime_flags)) {

		btrfs_add_ordered_operation(NULL, BTRFS_I(inode)->root, inode);

		if (inode->i_size > BTRFS_ORDERED_OPERATIONS_FLUSH_LIMIT)

			filemap_flush(inode->i_mapping);