Module Name: src
Committed By: riastradh
Date: Mon Aug 2 20:20:54 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/linux: linux_reservation.c
Log Message:
drm: Release fence if we're about to return too.
Should fix another fence leak.
XXX pullup-9
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
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.12 src/sys/external/bsd/drm2/linux/linux_reservation.c:1.13
--- src/sys/external/bsd/drm2/linux/linux_reservation.c:1.12 Sun Jun 27 08:10:36 2021
+++ src/sys/external/bsd/drm2/linux/linux_reservation.c Mon Aug 2 20:20:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_reservation.c,v 1.12 2021/06/27 08:10:36 riastradh Exp $ */
+/* $NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 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.12 2021/06/27 08:10:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_reservation.c,v 1.13 2021/08/02 20:20:54 riastradh Exp $");
#include <sys/param.h>
#include <sys/poll.h>
@@ -794,9 +794,9 @@ wait:
KASSERT(fence != NULL);
rcu_read_unlock();
ret = fence_wait_timeout(fence, intr, timeout);
+ fence_put(fence);
if (ret <= 0)
return ret;
- fence_put(fence);
KASSERT(ret <= timeout);
timeout = ret;
goto top;
