btrfs: make free_io_failure take btrfs_inode (4ac1f4ac) · Commits · 戴 / test

fs/btrfs/extent_io.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -1959,11 +1959,11 @@ static void check_page_uptodate(struct extent_io_tree tree, struct page page)
		SetPageUptodate(page);
		}

		int free_io_failure(struct inode inode, struct io_failure_record rec)
		int free_io_failure(struct btrfs_inode inode, struct io_failure_record rec)
		{
		int ret;
		int err = 0;
		struct extent_io_tree *failure_tree = &BTRFS_I(inode)->io_failure_tree;
		struct extent_io_tree *failure_tree = &inode->io_failure_tree;

		set_state_failrec(failure_tree, rec->start, NULL);
		ret = clear_extent_bits(failure_tree, rec->start,
		@@ -1972,7 +1972,7 @@ int free_io_failure(struct inode inode, struct io_failure_record rec)
		if (ret)
		err = ret;

		ret = clear_extent_bits(&BTRFS_I(inode)->io_tree, rec->start,
		ret = clear_extent_bits(&inode->io_tree, rec->start,
		rec->start + rec->len - 1,
		EXTENT_DAMAGED);
		if (ret && !err)
		@@ -2140,7 +2140,7 @@ int clean_io_failure(struct inode inode, u64 start, struct page page,
		}

		out:
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);

		return 0;
		}
		@@ -2393,7 +2393,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,

		ret = btrfs_check_repairable(inode, failed_bio, failrec, failed_mirror);
		if (!ret) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		return -EIO;
		}

		@@ -2406,7 +2406,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
		(int)phy_offset, failed_bio->bi_end_io,
		NULL);
		if (!bio) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		return -EIO;
		}
		bio_set_op_attrs(bio, REQ_OP_READ, read_mode);
		@@ -2418,7 +2418,7 @@ static int bio_readpage_error(struct bio *failed_bio, u64 phy_offset,
		ret = tree->ops->submit_bio_hook(inode, bio, failrec->this_mirror,
		failrec->bio_flags, 0);
		if (ret) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		bio_put(bio);
		}

fs/btrfs/extent_io.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -480,6 +480,8 @@ struct io_failure_record {
		int in_validation;
		};

		struct btrfs_inode;

		void btrfs_free_io_failure_record(struct 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);
		@@ -489,7 +491,7 @@ struct bio btrfs_create_repair_bio(struct inode inode, struct bio *failed_bio,
		struct io_failure_record *failrec,
		struct page *page, int pg_offset, int icsum,
		bio_end_io_t endio_func, void data);
		int free_io_failure(struct inode inode, struct io_failure_record rec);
		int free_io_failure(struct btrfs_inode inode, struct io_failure_record rec);
		#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS
		noinline u64 find_lock_delalloc_range(struct inode *inode,
		struct extent_io_tree *tree,

fs/btrfs/inode.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -7859,7 +7859,7 @@ static int dio_read_error(struct inode inode, struct bio failed_bio,
		ret = btrfs_check_dio_repairable(inode, failed_bio, failrec,
		failed_mirror);
		if (!ret) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		return -EIO;
		}

		@@ -7873,7 +7873,7 @@ static int dio_read_error(struct inode inode, struct bio failed_bio,
		bio = btrfs_create_repair_bio(inode, failed_bio, failrec, page,
		pgoff, isector, repair_endio, repair_arg);
		if (!bio) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		return -EIO;
		}
		bio_set_op_attrs(bio, REQ_OP_READ, read_mode);
		@@ -7884,7 +7884,7 @@ static int dio_read_error(struct inode inode, struct bio failed_bio,

		ret = submit_dio_repair_bio(inode, bio, failrec->this_mirror);
		if (ret) {
		free_io_failure(inode, failrec);
		free_io_failure(BTRFS_I(inode), failrec);
		bio_put(bio);
		}

Admin message