  		if (r->biorq_flags & BIORQ_DIO) {
  			/*
  			 * Support mix of dio and cached reads.  This
-@@ -889,116 +836,57 @@
+@@ -889,116 +827,56 @@
  			 * the tail of the file in msl_io().
  			 */
  			len += r->biorq_len;

 	struct msl_fsrqinfo *q = NULL;
 	struct fidc_membh *f;
 	struct bmpc_ioreq *r;
@@ -2406,7 +2242,7 @@
 	e = ((off + size) - 1) / SLASH_BMAP_SIZE;
 	nr = e - s + 1;
 	if (nr > MAX_BMAPS_REQ) {

 	case -SLERR_AIOWAIT:
 	case -EKEYEXPIRED:
 	default:
@@ -1414,6 +1286,24 @@
  out:
 	PSCFREE(iovs);
 	sl_csvc_decref(csvc);
