Module Name: src
Committed By: riastradh
Date: Mon Aug 27 14:14:13 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/linux: linux_reservation.c
Log Message:
Clarify with comments and assertions.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/linux/linux_reservation.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/external/bsd/drm2/linux/linux_reservation.c
diff -u src/sys/external/bsd/drm2/linux/linux_reservation.c:1.6 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.7
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.6 Mon Aug 27 14:13:46 2018
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Mon Aug 27 14:14:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_reservation.c,v 1.6 2018/08/27 14:13:46 riastradh Exp $ */
+/* $NetBSD: linux_reservation.c,v 1.7 2018/08/27 14:14:13 riastradh Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.6 2018/08/27 14:13:46 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.7 2018/08/27 14:14:13 riastradh Exp $");
#include <linux/fence.h>
#include <linux/reservation.h>
@@ -390,6 +390,11 @@ reservation_object_add_shared_fence(stru
/* Check for a preallocated replacement list. */
if (prealloc == NULL) {
+ /*
+ * If there is no preallocated replacement list, then
+ * there must be room in the current list.
+ */
+ KASSERT(list != NULL);
KASSERT(list->shared_count < list->shared_max);
/* Begin an update. */
@@ -411,8 +416,14 @@ reservation_object_add_shared_fence(stru
/* Commit the update. */
reservation_object_write_commit(robj, &ticket);
} else {
+ /*
+ * There is a preallocated replacement list. There may
+ * not be a current list. If not, treat it as a zero-
+ * length list.
+ */
uint32_t shared_count = (list == NULL? 0 : list->shared_count);
+ /* There had better be room in the preallocated list. */
KASSERT(shared_count < prealloc->shared_max);
/*
