Page MenuHomeFreeBSD
Files F153488419

D5709.id14691.diff
No OneTemporary
Actions

D5709.id14691.diff
View Options

Index: share/man/man9/alq.9
===================================================================
--- share/man/man9/alq.9
+++ share/man/man9/alq.9
@@ -31,7 +31,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 26, 2010
+.Dd March 22, 2016
.Dt ALQ 9
.Os
.Sh NAME
@@ -73,7 +73,7 @@
.Fn alq_write "struct alq *alq" "void *data" "int flags"
.Ft void
.Fn alq_flush "struct alq *alq"
-.Ft void
+.Ft int
.Fn alq_close "struct alq *alq"
.Ft struct ale *
.Fn alq_getn "struct alq *alq" "int len" "int flags"
@@ -414,6 +414,13 @@
.Fa flags
and either the queue is full or the system is shutting down.
.Pp
+The
+.Fn alq_close
+function will return any error encountered from
+.Xr VOP_WRITE 9
+or
+.Xr VOP_CLOSE 9 .
+.Pp
NOTE: invalid arguments to non-void functions will result in
undefined behaviour.
.Sh SEE ALSO
Index: sys/kern/kern_alq.c
===================================================================
--- sys/kern/kern_alq.c
+++ sys/kern/kern_alq.c
@@ -68,6 +68,9 @@
* NB: Used as a wait channel so must
* not be first field in the alq struct
*/
+ int aq_error; /* Any error from writing, returned
+ * from alq_close().
+ */
struct ale aq_getpost; /* ALE for use by get/post */
struct mtx aq_mtx; /* Queue lock */
struct vnode *aq_vp; /* Open vnode handle */
@@ -239,6 +242,7 @@
LIST_REMOVE(alq, aq_link);
ALD_UNLOCK();
alq_shutdown(alq);
+ alq_destroy(alq);
ALD_LOCK();
}
@@ -259,6 +263,8 @@
static void
alq_shutdown(struct alq *alq)
{
+ int error;
+
ALQ_LOCK(alq);
/* Stop any new writers. */
@@ -283,19 +289,22 @@
alq->aq_flags |= AQ_WANTED;
msleep_spin(alq, &alq->aq_mtx, "aldclose", 0);
}
+ KASSERT(!HAS_PENDING_DATA(alq), ("%s: queue not empty!", __func__));
ALQ_UNLOCK(alq);
- vn_close(alq->aq_vp, FWRITE, alq->aq_cred,
- curthread);
+ error = vn_close(alq->aq_vp, FWRITE, alq->aq_cred, curthread);
+ if (error != 0)
+ alq->aq_error = error;
crfree(alq->aq_cred);
}
void
alq_destroy(struct alq *alq)
{
- /* Drain all pending IO. */
- alq_shutdown(alq);
+ KASSERT(!HAS_PENDING_DATA(alq), ("%s: queue not empty!", __func__));
+ KASSERT((alq->aq_flags & AQ_SHUTDOWN) != 0, ("%s called without"
+ " alq_shutdown()", __func__));
mtx_destroy(&alq->aq_mtx);
free(alq->aq_entbuf, M_ALD);
free(alq, M_ALD);
@@ -312,6 +321,7 @@
struct vnode *vp;
struct uio auio;
struct iovec aiov[2];
+ int error;
int totlen;
int iov;
int wrapearly;
@@ -367,17 +377,17 @@
*/
vn_start_write(vp, &mp, V_WAIT);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
- /*
- * XXX: VOP_WRITE error checks are ignored.
- */
#ifdef MAC
- if (mac_vnode_check_write(alq->aq_cred, NOCRED, vp) == 0)
+ error = mac_vnode_check_write(alq->aq_cred, NOCRED, vp);
+ if (error == 0)
#endif
- VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, alq->aq_cred);
+ error = VOP_WRITE(vp, &auio, IO_UNIT | IO_APPEND, alq->aq_cred);
VOP_UNLOCK(vp, 0);
vn_finished_write(mp);
ALQ_LOCK(alq);
+ if (error != 0)
+ alq->aq_error = error;
alq->aq_flags &= ~AQ_FLUSHING;
/* Adjust writetail as required, taking into account wrapping. */
@@ -470,6 +480,7 @@
alq->aq_flags |= AQ_ORDERED;
if ((error = ald_add(alq)) != 0) {
+ alq_shutdown(alq);
alq_destroy(alq);
return (error);
}
@@ -912,12 +923,24 @@
/*
* Flush remaining data, close the file and free all resources.
*/
-void
+int
alq_close(struct alq *alq)
{
+ int error;
+
/* Only flush and destroy alq if not already shutting down. */
- if (ald_rem(alq) == 0)
- alq_destroy(alq);
+ error = ald_rem(alq);
+ if (error != 0)
+ return (error);
+ /*
+ * Drain all pending IO and fetch the error to return before
+ * destroying the alq.
+ */
+ alq_shutdown(alq);
+ error = alq->aq_error;
+ alq_destroy(alq);
+
+ return (error);
}
static int
Index: sys/sys/alq.h
===================================================================
--- sys/sys/alq.h
+++ sys/sys/alq.h
@@ -106,7 +106,7 @@
/*
* alq_close: Flush the queue and free all resources.
*/
-void alq_close(struct alq *alq);
+int alq_close(struct alq *alq);
/*
* alq_getn: Return an entry for direct access

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 10:49 AM (8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31971691
Default Alt Text
D5709.id14691.diff (4 KB)

Event Timeline