[src/trunk]: src/sys/dev/scsipi really keep request queued after resource sho...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ec6bd037db94
branches:  trunk
changeset: 349746:ec6bd037db94
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Wed Dec 21 21:28:30 2016 +0000

description:
really keep request queued after resource shortage

diffstat:

 sys/dev/scsipi/cd.c |  6 +++---
 sys/dev/scsipi/sd.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 116722005525 -r ec6bd037db94 sys/dev/scsipi/cd.c
--- a/sys/dev/scsipi/cd.c       Wed Dec 21 21:26:28 2016 +0000
+++ b/sys/dev/scsipi/cd.c       Wed Dec 21 21:28:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cd.c,v 1.337 2016/12/21 00:56:30 mlelstv Exp $ */
+/*     $NetBSD: cd.c,v 1.338 2016/12/21 21:28:30 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.337 2016/12/21 00:56:30 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.338 2016/12/21 21:28:30 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -847,7 +847,7 @@
                 * retry later.
                 */
                callout_reset(&cd->sc_callout, hz / 2, cdrestart, cd);
-               error = 0;
+               error = EAGAIN;
                goto out;
        }
 
diff -r 116722005525 -r ec6bd037db94 sys/dev/scsipi/sd.c
--- a/sys/dev/scsipi/sd.c       Wed Dec 21 21:26:28 2016 +0000
+++ b/sys/dev/scsipi/sd.c       Wed Dec 21 21:28:30 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sd.c,v 1.321 2016/12/16 14:58:53 mlelstv Exp $ */
+/*     $NetBSD: sd.c,v 1.322 2016/12/21 21:28:30 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.321 2016/12/16 14:58:53 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.322 2016/12/21 21:28:30 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
@@ -754,7 +754,7 @@
                 * retry later.
                 */
                callout_reset(&sd->sc_callout, hz / 2, sdrestart, sd);
-               error = 0;
+               error = EAGAIN;
                goto out;
        }