This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, ibm/2.13/master, updated. glibc-2.13-17-g7933fbc
- From: rsa at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 May 2011 22:09:07 -0000
- Subject: GNU C Library master sources branch, ibm/2.13/master, updated. glibc-2.13-17-g7933fbc
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, ibm/2.13/master has been updated
via 7933fbca75326867926b70da3ab5f3286691699f (commit)
from cc390a1f1508a79ba7a4d5bb2f04c161a4b45bd9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7933fbca75326867926b70da3ab5f3286691699f
commit 7933fbca75326867926b70da3ab5f3286691699f
Author: Andreas Schwab <schwab@linux-m68k.org>
Date: Sat Apr 9 11:07:18 2011 -0400
Make ppc sync_file_range cancelable.
(cherry picked from commit f12a32e6f02c058c4996a138f16828f772059116)
diff --git a/ChangeLog b/ChangeLog
index bb98ede..a9a37e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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-03-14 Andreas Schwab <schwab@redhat.com>
* elf/dl-load.c (_dl_dst_substitute): When skipping the first
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
index 1ca4ce6..ccbca4d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/sync_file_range.c
@@ -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)
{
- return INLINE_SYSCALL (sync_file_range2, 4, fd, flags, from, to);
+ 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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
.../sysv/linux/powerpc/powerpc64/sync_file_range.c | 16 +++++++++++++---
2 files changed, 18 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources