From: Julian Seward <jseward@acm.org>
Date: Wed, 4 Jun 2008 07:01:22 +0000 (+0000)
Subject: Merge r8177 (Add '*flags |= SfMayBlock' to PRE(sys_sync_file_range).)
X-Git-Tag: svn/VALGRIND_3_3_1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a172528064dd0184ff31886fd5c5efed13a3210e;p=thirdparty%2Fvalgrind.git

Merge r8177 (Add '*flags |= SfMayBlock' to PRE(sys_sync_file_range).)


git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8179
---

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index d8006a8ab6..77df5f3483 100644
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -2275,13 +2275,14 @@ POST(sys_waitid)
 
 PRE(sys_sync_file_range)
 {
-  PRINT("sys_sync_file_range ( %d, %lld, %lld, %d )",
-	ARG1,ARG2,ARG3,ARG4);
-  PRE_REG_READ4(long, "sync_file_range",
-		int, fd, vki_loff_t, offset, vki_loff_t, nbytes,
-		unsigned int, flags);
-  if (!ML_(fd_allowed)(ARG1, "sync_file_range", tid, False))
-     SET_STATUS_Failure( VKI_EBADF );
+   *flags |= SfMayBlock;
+   PRINT("sys_sync_file_range ( %d, %lld, %lld, %d )",
+         ARG1,ARG2,ARG3,ARG4);
+   PRE_REG_READ4(long, "sync_file_range",
+                 int, fd, vki_loff_t, offset, vki_loff_t, nbytes,
+                 unsigned int, flags);
+   if (!ML_(fd_allowed)(ARG1, "sync_file_range", tid, False))
+      SET_STATUS_Failure( VKI_EBADF );
 }
 
 /* ---------------------------------------------------------------------