Module Name: src
Committed By: mlelstv
Date: Wed Dec 21 21:28:30 UTC 2016
Modified Files:
src/sys/dev/scsipi: cd.c sd.c
Log Message:
really keep request queued after resource shortage
To generate a diff of this commit:
cvs rdiff -u -r1.337 -r1.338 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/scsipi/sd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.337 src/sys/dev/scsipi/cd.c:1.338
--- src/sys/dev/scsipi/cd.c:1.337 Wed Dec 21 00:56:30 2016
+++ src/sys/dev/scsipi/cd.c Wed Dec 21 21:28:30 2016
@@ -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 @@ cd_diskstart(device_t dev, struct buf *b
* retry later.
*/
callout_reset(&cd->sc_callout, hz / 2, cdrestart, cd);
- error = 0;
+ error = EAGAIN;
goto out;
}
Index: src/sys/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.321 src/sys/dev/scsipi/sd.c:1.322
--- src/sys/dev/scsipi/sd.c:1.321 Fri Dec 16 14:58:53 2016
+++ src/sys/dev/scsipi/sd.c Wed Dec 21 21:28:30 2016
@@ -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 @@ sd_diskstart(device_t dev, struct buf *b
* retry later.
*/
callout_reset(&sd->sc_callout, hz / 2, sdrestart, sd);
- error = 0;
+ error = EAGAIN;
goto out;
}
