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

Commit 32240a91 authored by Jan Schmidt's avatar Jan Schmidt Committed by Chris Mason
Browse files

btrfs: mirror_num should be int, not u64 



My previous patch introduced some u64 for failed_mirror variables, this one
makes it consistent again.

Signed-off-by: default avatarJan Schmidt <list.btrfs@jan-o-sch.net>
Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 745c4d8e

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end, 


static int btree_io_failed_hook(struct bio *failed_bio,

			 struct page *page, u64 start, u64 end,

			 u64 mirror_num, struct extent_state *state)

			 int mirror_num, struct extent_state *state)

{

	struct extent_io_tree *tree;

	unsigned long len;

fs/btrfs/extent_io.c

+2 −2
Original line number Diff line number Diff line
@@ -2285,8 +2285,8 @@ static void end_bio_extent_readpage(struct bio *bio, int err) 
				clean_io_failure(start, page);

		}

		if (!uptodate) {

			u64 failed_mirror;

			failed_mirror = (unsigned long)bio->bi_bdev;

			int failed_mirror;

			failed_mirror = (int)(unsigned long)bio->bi_bdev;

			if (tree->ops && tree->ops->readpage_io_failed_hook)

				ret = tree->ops->readpage_io_failed_hook(

						bio, page, start, end,

fs/btrfs/extent_io.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct extent_io_ops { 
			      unsigned long bio_flags);

	int (*readpage_io_hook)(struct page *page, u64 start, u64 end);

	int (*readpage_io_failed_hook)(struct bio *bio, struct page *page,

				       u64 start, u64 end, u64 failed_mirror,

				       u64 start, u64 end, int failed_mirror,

				       struct extent_state *state);

	int (*writepage_io_failed_hook)(struct bio *bio, struct page *page,

					u64 start, u64 end,