diff options
author | Boaz Harrosh <bharrosh@panasas.com> | 2011-12-27 12:23:36 -0500 |
---|---|---|
committer | Boaz Harrosh <bharrosh@panasas.com> | 2012-01-06 09:49:06 -0500 |
commit | ffefb8eaa367e8a5c14f779233d9da1fbc23d164 (patch) | |
tree | 6be1540656853d64a762625386d515b12e363dd4 /fs/exofs/ore.c | |
parent | 831c2dc5f47c1dc79c32229d75065ada1dcc66e1 (diff) |
ore: Fix crash in case of an IO error.
The users of ore_check_io() expect the reported device
(In case of error) to be indexed relative to the passed-in
ore_components table, and not the logical dev index.
This causes a crash inside objlayoutdriver in case of
an IO error.
[Bug in 3.2.0 Kernel]
CC: Stable Tree <stable@kernel.org>
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Diffstat (limited to 'fs/exofs/ore.c')
-rw-r--r-- | fs/exofs/ore.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/exofs/ore.c b/fs/exofs/ore.c index d271ad837202..894f3e192e6b 100644 --- a/fs/exofs/ore.c +++ b/fs/exofs/ore.c | |||
@@ -445,10 +445,10 @@ int ore_check_io(struct ore_io_state *ios, ore_on_dev_error on_dev_error) | |||
445 | u64 residual = ios->reading ? | 445 | u64 residual = ios->reading ? |
446 | or->in.residual : or->out.residual; | 446 | or->in.residual : or->out.residual; |
447 | u64 offset = (ios->offset + ios->length) - residual; | 447 | u64 offset = (ios->offset + ios->length) - residual; |
448 | struct ore_dev *od = ios->oc->ods[ | 448 | unsigned dev = per_dev->dev - ios->oc->first_dev; |
449 | per_dev->dev - ios->oc->first_dev]; | 449 | struct ore_dev *od = ios->oc->ods[dev]; |
450 | 450 | ||
451 | on_dev_error(ios, od, per_dev->dev, osi.osd_err_pri, | 451 | on_dev_error(ios, od, dev, osi.osd_err_pri, |
452 | offset, residual); | 452 | offset, residual); |
453 | } | 453 | } |
454 | if (osi.osd_err_pri >= acumulated_osd_err) { | 454 | if (osi.osd_err_pri >= acumulated_osd_err) { |