diff --git a/[refs] b/[refs]
index 08accf9bec9c..a8feaec1345f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 831c2dc5f47c1dc79c32229d75065ada1dcc66e1
+refs/heads/master: ffefb8eaa367e8a5c14f779233d9da1fbc23d164
diff --git a/trunk/fs/exofs/ore.c b/trunk/fs/exofs/ore.c
index d271ad837202..894f3e192e6b 100644
--- a/trunk/fs/exofs/ore.c
+++ b/trunk/fs/exofs/ore.c
@@ -445,10 +445,10 @@ int ore_check_io(struct ore_io_state *ios, ore_on_dev_error on_dev_error)
 			u64 residual = ios->reading ?
 					or->in.residual : or->out.residual;
 			u64 offset = (ios->offset + ios->length) - residual;
-			struct ore_dev *od = ios->oc->ods[
-					per_dev->dev - ios->oc->first_dev];
+			unsigned dev = per_dev->dev - ios->oc->first_dev;
+			struct ore_dev *od = ios->oc->ods[dev];
 
-			on_dev_error(ios, od, per_dev->dev, osi.osd_err_pri,
+			on_dev_error(ios, od, dev, osi.osd_err_pri,
 				     offset, residual);
 		}
 		if (osi.osd_err_pri >= acumulated_osd_err) {