Make ppc sync_file_range cancelable.

This commit is contained in:
Andreas Schwab 2011-04-09 11:07:18 -04:00 committed by Ulrich Drepper
parent 38a7d692fc
commit f12a32e6f0
2 changed files with 18 additions and 3 deletions

View File

@ -1,3 +1,8 @@
2011-04-08 Andreas Schwab <schwab@linux-m68k.org>
* sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c:
Make cancelable.
2011-04-09 Ulrich Drepper <drepper@gmail.com>
[BZ #12655]

View File

@ -1,5 +1,5 @@
/* Selective file content synch'ing.
Copyright (C) 2006, 2007, 2009 Free Software Foundation, Inc.
Copyright (C) 2006, 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
@ -21,7 +21,7 @@
#include <fcntl.h>
#include <sys/types.h>
#include <sysdep.h>
#include <sysdep-cancel.h>
#include <sys/syscall.h>
@ -29,7 +29,17 @@
int
sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags)
{
if (SINGLE_THREAD_P)
return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
int result;
int oldtype = LIBC_CANCEL_ASYNC ();
result = INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
LIBC_CANCEL_RESET (oldtype);
return result;
}
#else
int