  		if (r->biorq_flags & BIORQ_DIO) {
  			/*
  			 * Support mix of dio and cached reads.  This
-@@ -890,116 +790,59 @@
+@@ -890,116 +792,59 @@
  			 * the tail of the file in msl_io().
  			 */
  			len += r->biorq_len;

 		if (i && !len)
 			/*
 			 * This fsrq has 2 biorqs (probably spanned two
@@ -881,7 +781,7 @@
 			 * cache so interpolate its len.
 			 */
 			len = q->mfsrq_size - r->biorq_len;

 		if (rc) {
 			if (expired_lease || maxretries) {
 				/* Cleanup errored I/O requests.
@@ -1264,12 +1107,13 @@
 }
 
 int
