btrfs: make btrfs_free_io_failure_record take btrfs_inode (7ab7956e) · Commits · 戴 / test

fs/btrfs/extent_io.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2152,9 +2152,9 @@ out:
		* - under ordered extent
		* - the inode is freeing
		*/
		void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end)
		void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start, u64 end)
		{
		struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;
		struct extent_io_tree *failure_tree = &inode->io_failure_tree;
		struct io_failure_record *failrec;
		struct extent_state state, next;

+2 −1

Original line number	Diff line number	Diff line
		@@ -482,7 +482,8 @@ struct io_failure_record {
		};


		void btrfs_free_io_failure_record(struct inode *inode, u64 start, u64 end);
		void btrfs_free_io_failure_record(struct btrfs_inode *inode, u64 start,
		u64 end);
		int btrfs_get_io_failure_record(struct inode *inode, u64 start, u64 end,
		struct io_failure_record **failrec_ret);
		int btrfs_check_repairable(struct inode inode, struct bio failed_bio,

+5 −4

Original line number	Diff line number	Diff line
		@@ -2803,7 +2803,8 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
		goto out;
		}

		btrfs_free_io_failure_record(inode, ordered_extent->file_offset,
		btrfs_free_io_failure_record(BTRFS_I(inode),
		ordered_extent->file_offset,
		ordered_extent->file_offset +
		ordered_extent->len - 1);

		@@ -5196,7 +5197,7 @@ void btrfs_evict_inode(struct inode *inode)
		if (!special_file(inode->i_mode))
		btrfs_wait_ordered_range(inode, 0, (u64)-1);

		btrfs_free_io_failure_record(inode, 0, (u64)-1);
		btrfs_free_io_failure_record(BTRFS_I(inode), 0, (u64)-1);

		if (test_bit(BTRFS_FS_LOG_RECOVERING, &fs_info->flags)) {
		BUG_ON(test_bit(BTRFS_INODE_HAS_ORPHAN_ITEM,