linux-btrfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Btrfs: fix repair code for RAID10
@ 2012-04-25 11:42 Jan Schmidt
  2012-04-28 14:36 ` Remco Hosman
  0 siblings, 1 reply; 2+ messages in thread
From: Jan Schmidt @ 2012-04-25 11:42 UTC (permalink / raw)
  To: chris.mason, linux-btrfs; +Cc: remco

btrfs_map_block sets mirror_num, so that the repair code knows eventually
which device gave us the read error. For RAID10, mirror_num must be 1 or 2.
Before this fix mirror_num was incorrectly related to our stripe index.

Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
---
 fs/btrfs/volumes.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 3b98417..1411b99 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3807,10 +3807,11 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
 		else if (mirror_num)
 			stripe_index += mirror_num - 1;
 		else {
+			int old_stripe_index = stripe_index;
 			stripe_index = find_live_mirror(map, stripe_index,
 					      map->sub_stripes, stripe_index +
 					      current->pid % map->sub_stripes);
-			mirror_num = stripe_index + 1;
+			mirror_num = stripe_index - old_stripe_index + 1;
 		}
 	} else {
 		/*
-- 
1.7.3.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Btrfs: fix repair code for RAID10
  2012-04-25 11:42 [PATCH] Btrfs: fix repair code for RAID10 Jan Schmidt
@ 2012-04-28 14:36 ` Remco Hosman
  0 siblings, 0 replies; 2+ messages in thread
From: Remco Hosman @ 2012-04-28 14:36 UTC (permalink / raw)
  To: Jan Schmidt; +Cc: chris.mason@oracle.com, linux-btrfs@vger.kernel.org

On 25 Apr 2012, at 13:42, Jan Schmidt <list.btrfs@jan-o-sch.net> wrote:

> btrfs_map_block sets mirror_num, so that the repair code knows eventually
> which device gave us the read error. For RAID10, mirror_num must be 1 or 2.
> Before this fix mirror_num was incorrectly related to our stripe index.
> 
> Signed-off-by: Jan Schmidt <list.btrfs@jan-o-sch.net>
> ---
> fs/btrfs/volumes.c |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index 3b98417..1411b99 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -3807,10 +3807,11 @@ static int __btrfs_map_block(struct btrfs_mapping_tree *map_tree, int rw,
>        else if (mirror_num)
>            stripe_index += mirror_num - 1;
>        else {
> +            int old_stripe_index = stripe_index;
>            stripe_index = find_live_mirror(map, stripe_index,
>                          map->sub_stripes, stripe_index +
>                          current->pid % map->sub_stripes);
> -            mirror_num = stripe_index + 1;
> +            mirror_num = stripe_index - old_stripe_index + 1;
>        }
>    } else {
>        /*
> -- 
> 1.7.3.4
> 

Tested-by: Remco Hosman
remco@hosman.xs4all.nl


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-04-28 14:36 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-25 11:42 [PATCH] Btrfs: fix repair code for RAID10 Jan Schmidt
2012-04-28 14:36 ` Remco Hosman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).