  		pscrpc_set_destroy(r->biorq_rqset);
  		r->biorq_rqset = NULL;
  	}
-@@ -699,67 +629,35 @@
+@@ -699,67 +581,35 @@
  	return (NULL);
  }
  

 	struct bmapc_memb		*biorq_bmap;	/* backpointer to our bmap	*/
 	struct pscrpc_request_set	*biorq_rqset;
 	struct psc_waitq		 biorq_waitq;	/* used by a bmpce */
@@ -298,6 +298,8 @@
 #define BIORQ_BMAPFAIL			(1 << 20)
 #define BIORQ_READFAIL			(1 << 21)
 #define BIORQ_PENDING			(1 << 22)
+#define BIORQ_WAIT			(1 << 23)
+#define BIORQ_DATARDY			(1 << 24)
 
 #define BIORQ_LOCK(r)			spinlock(&(r)->biorq_lock)
 #define BIORQ_ULOCK(r)			freelock(&(r)->biorq_lock)
@@ -308,7 +310,7 @@
 #define DEBUG_BIORQ(level, b, fmt, ...)					\
 	psclogs((level), SLSS_BMAP, "biorq@%p "				\
 	    "fl=%#x:%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s "	\

 	return (rc);
 
  error:
@@ -1439,9 +1307,6 @@
 		csvc = NULL;
 	}
 
