svn commit: r266325 - stable/9/lib/libc/gen

[Konstantin Belousov]

Author: kib
Date: Sat May 17 16:26:59 2014
New Revision: 266325
URL: http://svnweb.freebsd.org/changeset/base/266325

Log:
  MFC r246872 (by davidxu):
  
  Simplify code by using flag O_EXLOCK.

Modified:
  stable/9/lib/libc/gen/sem_new.c
Directory Properties:
  stable/9/lib/libc/   (props changed)

Modified: stable/9/lib/libc/gen/sem_new.c
==============================================================================
--- stable/9/lib/libc/gen/sem_new.c     Sat May 17 16:22:25 2014        
(r266324)
+++ stable/9/lib/libc/gen/sem_new.c     Sat May 17 16:26:59 2014        
(r266325)
@@ -198,15 +198,11 @@ _sem_open(const char *name, int flags, .
                goto error;
        }
 
-       fd = _open(path, flags|O_RDWR|O_CLOEXEC, mode);
+       fd = _open(path, flags|O_RDWR|O_CLOEXEC|O_EXLOCK, mode);
        if (fd == -1)
                goto error;
-       if (flock(fd, LOCK_EX) == -1)
+       if (_fstat(fd, &sb))
                goto error;
-       if (_fstat(fd, &sb)) {
-               flock(fd, LOCK_UN);
-               goto error;
-       }
        if (sb.st_size < sizeof(sem_t)) {
                sem_t tmp;
 
@@ -214,10 +210,8 @@ _sem_open(const char *name, int flags, .
                tmp._kern._has_waiters = 0;
                tmp._kern._count = value;
                tmp._kern._flags = USYNC_PROCESS_SHARED | SEM_NAMED;
-               if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp)) {
-                       flock(fd, LOCK_UN);
+               if (_write(fd, &tmp, sizeof(tmp)) != sizeof(tmp))
                        goto error;
-               }
        }
        flock(fd, LOCK_UN);
        sem = (sem_t *)mmap(NULL, sizeof(sem_t), PROT_READ|PROT_WRITE,
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"