Commit d5c13f92 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by David Sterba
Browse files

btrfs: clean_tree_block should panic on observed memory corruption and return void 



 The only error condition in clean_tree_block is an accounting bug.
 Returning without modifying dirty_metadata_bytes and as if the cleaning
 as been performed may cause problems later so it should panic instead.

 It should probably be a BUG_ON but we have btrfs_panic now.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
parent d16cb050

fs/btrfs/disk-io.c

+10 −5
Original line number Diff line number Diff line
@@ -1109,7 +1109,7 @@ struct extent_buffer *read_tree_block(struct btrfs_root *root, u64 bytenr, 


}



int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,

void clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root,

		      struct extent_buffer *buf)

{

	struct inode *btree_inode = root->fs_info->btree_inode;
@@ -1121,8 +1121,14 @@ int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
			spin_lock(&root->fs_info->delalloc_lock);

			if (root->fs_info->dirty_metadata_bytes >= buf->len)

				root->fs_info->dirty_metadata_bytes -= buf->len;

			else

				WARN_ON(1);

			else {

				spin_unlock(&root->fs_info->delalloc_lock);

				btrfs_panic(root->fs_info, -EOVERFLOW,

					  "Can't clear %lu bytes from "

					  " dirty_mdatadata_bytes (%lu)",

					  buf->len,

					  root->fs_info->dirty_metadata_bytes);

			}

			spin_unlock(&root->fs_info->delalloc_lock);

		}
@@ -1131,7 +1137,6 @@ int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, 
		clear_extent_buffer_dirty(&BTRFS_I(btree_inode)->io_tree,

					  buf);

	}

	return 0;

}



static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize,

fs/btrfs/disk-io.h

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ int reada_tree_block_flagged(struct btrfs_root *root, u64 bytenr, u32 blocksize, 
			 int mirror_num, struct extent_buffer **eb);

struct extent_buffer *btrfs_find_create_tree_block(struct btrfs_root *root,

						   u64 bytenr, u32 blocksize);

int clean_tree_block(struct btrfs_trans_handle *trans,

void clean_tree_block(struct btrfs_trans_handle *trans,

		      struct btrfs_root *root, struct extent_buffer *buf);

int open_ctree(struct super_block *sb,

	       struct btrfs_fs_devices *fs_devices,

CRA Git | Maintained and supported by SUSTech CRA and CCSE