From: Rich Felker <dalias@aerifal.cx>
Date: Thu, 22 Sep 2011 01:30:45 +0000 (-0400)
Subject: avoid setting FILE lock count when not using flockfile
X-Git-Tag: v0.8.4~80
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ca52e347673126956a4f21247d8a551ea668f61f;p=oweals%2Fmusl.git

avoid setting FILE lock count when not using flockfile

for now this is just a tiny optimization, but later if we support
cancellation from __stdio_read and __stdio_write, it will be necessary
for the recusrive lock count to be zero in order for these functions
to know they are responsible for unlocking the FILE on cancellation.
---

diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c
index 6ebf6202..3bf3c26b 100644
--- a/src/stdio/__lockfile.c
+++ b/src/stdio/__lockfile.c
@@ -8,7 +8,7 @@ int __lockfile(FILE *f)
 		return 0;
 	while ((owner = a_cas(&f->lock, 0, tid)))
 		__wait(&f->lock, &f->waiters, owner, 1);
-	return f->lockcount = 1;
+	return 1;
 }
 
 void __unlockfile(FILE *f)