diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-15 21:22:26 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-15 21:22:26 +0000 |
| commit | 7a1147946ecd5fe962e2959afe69c25c7a553672 (patch) | |
| tree | a6ffd9a6c377d19c531d24e4ac5f9e820a14b72e /sysdeps/generic/lockf.c | |
| parent | 1fde494e69792603263bdf85819831f00d29cee4 (diff) | |
| download | glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.zip glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.gz glibc-7a1147946ecd5fe962e2959afe69c25c7a553672.tar.bz2 | |
Update.
2003-06-15 Ulrich Drepper <drepper@redhat.com>
Fix cancellation point handling wrt exception based cleanup.
* io/Makefile: Compile fcntl.c, poll.c, and lockf.c with exceptions.
* misc/Makefile: Compile pselect.c, readv.c, writev.c, and usleep.c
with exceptions.
* posix/Makefile: Compile pread.c, pread64.c, pwrite.c, pwrite64.c,
sleep.c, wait.c, waitid.c, and waitpid.c with exceptions.
* rt/Makefile: Compile aio_suspend.c and clock_nanosleep.c with
exceptions.
* signal/Makefile: Compile sigpause.c, sigsuspend.c, sigtimedwait.c,
sigwait.c, and sigwaitinfo.c with exceptions.
* stdlib/Makefile: Compile system.c with exceptions.
* sysvipc/Makefile: Compile msgrcv.c and msgsnd.c with exceptions.
* termios/Makefile: Compile tcdrain.c with exceptions.
* sysdeps/generic/lockf.c: Add comment explaining the cancellation
situation.
* sysdeps/generic/pselect.c: Likewise.
* sysdeps/posix/sigpause.c: Likewise.
* sysdeps/posix/system.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/sleep.c: Likewise.
* sysdeps/unix/sysv/linux/usleep.c: Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h: Major rewrite of
INTERNAL_SYSCALL to not use push inside asm statement so that
unwind info is correct around the syscall.
* sysdeps/unix/clock_nanosleep.c: Add cancellation support.
* sysdeps/unix/sysv/linux/clock_nanosleep.c: Likewise.
Diffstat (limited to 'sysdeps/generic/lockf.c')
| -rw-r--r-- | sysdeps/generic/lockf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sysdeps/generic/lockf.c b/sysdeps/generic/lockf.c index 182a700..7b23f66 100644 --- a/sysdeps/generic/lockf.c +++ b/sysdeps/generic/lockf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1994,1996,1997,1998,2000,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -67,5 +67,8 @@ lockf (int fd, int cmd, off_t len) return -1; } + /* lockf() is a cancellation point but so is fcntl() if F_SETLKW is + used. Therefore we don't have to care about cancellation here, + the fcntl() function will take care of it. */ return __fcntl (fd, cmd, &fl); } |