D38611.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D38611.diff
View Options

	diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
	--- a/sys/kern/vfs_aio.c
	+++ b/sys/kern/vfs_aio.c
	@@ -1281,7 +1281,7 @@
	}

	bios = malloc(sizeof(struct bio ) iovcnt, M_TEMP, M_WAITOK);
	- atomic_store_int(&job->nbio, iovcnt);
	+ refcount_init(&job->nbio, iovcnt);
	for (i = 0; i < iovcnt; i++) {
	struct vm_page** pages;
	struct bio *bp;
	@@ -2489,15 +2489,16 @@
	* error of whichever failed bio completed last.
	*/
	if (flags & BIO_ERROR)
	- atomic_set_int(&job->error, bio_error);
	+ atomic_store_int(&job->error, bio_error);
	if (opcode & LIO_WRITE)
	atomic_add_int(&job->outblock, nblks);
	else
	atomic_add_int(&job->inblock, nblks);

	- if (atomic_fetchadd_int(&job->nbio, -1) == 1) {
	- if (atomic_load_int(&job->error))
	- aio_complete(job, -1, job->error);
	+ if (refcount_release(&job->nbio)) {
	+ bio_error = atomic_load_int(&job->error);
	+ if (bio_error != 0)
	+ aio_complete(job, -1, bio_error);
	else
	aio_complete(job, atomic_load_long(&job->nbytes), 0);
	}
	diff --git a/sys/sys/aio.h b/sys/sys/aio.h
	--- a/sys/sys/aio.h
	+++ b/sys/sys/aio.h
	@@ -151,7 +151,7 @@
	aio_handle_fn_t handle_fn; / (c) backend handle function */
	union { /* Backend-specific data fields */
	struct { /* BIO backend */
	- int nbio; /* Number of remaining bios */
	+ volatile u_int nbio; /* Number of remaining bios */
	int error; /* Worst error of all bios */
	long nbytes; /* Bytes completed so far */
	};