projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix (hopefully) statvfs breakage on x86_64 that resulted from fixing i386...
[musl]
/
src
/
stdio
/
ftrylockfile.c
diff --git
a/src/stdio/ftrylockfile.c
b/src/stdio/ftrylockfile.c
index
1d0a1ff
..
67f4b6a
100644
(file)
--- a/
src/stdio/ftrylockfile.c
+++ b/
src/stdio/ftrylockfile.c
@@
-3,16
+3,16
@@
int ftrylockfile(FILE *f)
{
int ftrylockfile(FILE *f)
{
+ int tid = pthread_self()->tid;
if (!libc.lockfile) libc.lockfile = __lockfile;
if (!libc.lockfile) libc.lockfile = __lockfile;
- if (f->
owner && f->owner == pthread_self()->
tid) {
+ if (f->
lock ==
tid) {
if (f->lockcount == INT_MAX)
return -1;
f->lockcount++;
return 0;
}
if (f->lockcount == INT_MAX)
return -1;
f->lockcount++;
return 0;
}
- if (
a_swap(&f->lock, 1
))
+ if (
f->lock || a_cas(&f->lock, 0, tid
))
return -1;
return -1;
- f->owner = pthread_self()->tid;
f->lockcount = 1;
return 0;
}
f->lockcount = 1;
return 0;
}