diff options
author | Ulrich Drepper <drepper@gmail.com> | 2011-04-01 11:15:08 -0400 |
---|---|---|
committer | Ulrich Drepper <drepper@gmail.com> | 2011-04-01 11:15:08 -0400 |
commit | 748876bf1c45cd10f998f8578c434156eae53b7e (patch) | |
tree | 2fcf11637d6246f8e4783a4ad6a4c9aff9ca972f /sysdeps/unix/sysv/linux/fallocate64.c | |
parent | 6e63d5e1aebc659a95223cf8862a7b42c67dbb1c (diff) | |
download | glibc-748876bf1c45cd10f998f8578c434156eae53b7e.tar.gz glibc-748876bf1c45cd10f998f8578c434156eae53b7e.tar.xz glibc-748876bf1c45cd10f998f8578c434156eae53b7e.zip |
Really implement fallocate{,64} and sync_file_range as cancellation points.
Diffstat (limited to 'sysdeps/unix/sysv/linux/fallocate64.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/fallocate64.c | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/fallocate64.c b/sysdeps/unix/sysv/linux/fallocate64.c index 751a7b2275..5cfd76d399 100644 --- a/sysdeps/unix/sysv/linux/fallocate64.c +++ b/sysdeps/unix/sysv/linux/fallocate64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 2007, 2009, 2011 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 @@ -18,7 +18,7 @@ #include <errno.h> #include <fcntl.h> -#include <sysdep.h> +#include <sysdep-cancel.h> /* Reserve storage for the data of the file associated with FD. */ @@ -26,11 +26,25 @@ int fallocate64 (int fd, int mode, __off64_t offset, __off64_t len) { #ifdef __NR_fallocate - return INLINE_SYSCALL (fallocate, 6, fd, mode, - __LONG_LONG_PAIR ((long int) (offset >> 32), - (long int) offset), - __LONG_LONG_PAIR ((long int) (len >> 32), - (long int) len)); + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (fallocate, 6, fd, mode, + __LONG_LONG_PAIR ((long int) (offset >> 32), + (long int) offset), + __LONG_LONG_PAIR ((long int) (len >> 32), + (long int) len)); + + int result; + int oldtype = LIBC_CANCEL_ASYNC (); + + result = INLINE_SYSCALL (fallocate, 6, fd, mode, + __LONG_LONG_PAIR ((long int) (offset >> 32), + (long int) offset), + __LONG_LONG_PAIR ((long int) (len >> 32), + (long int) len)); + + LIBC_CANCEL_RESET (oldtype); + + return result; #else __set_errno (ENOSYS); return -1; |