fix 346307 fuse filesystem syscall deadlocks

Mark 2 additional syscalls as 'mayblock' when fuse-compatible hint
is given.
Patch from aozgovde@ralota.com

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15112

diff --git a/NEWS b/NEWS
index 1b01dc09a7b7eb98eb9d3c3da513bd13d8b4a62b..a628934176b63d0f9497198dcbe39fb6e6b09f26 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -149,6 +149,7 @@ where XXXXXX is the bug number as listed below.
 345016  helgrind/tests/locked_vs_unlocked2 is failing sometimes
 345394  Fix memcheck/tests/strchr on OS X
 345637  Fix memcheck/tests/sendmsg on OS X
+346307  fuse filesystem syscall deadlocks
 n-i-bz  Provide implementations of certain compiler builtins to support
         compilers who may not provide those
 n-i-bz  Old STABS code is still being compiled, but never used. Remove it.

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 77644d5536a6909e9313d3f680f5f2bb0eb86e28..e1f8a5b26d8afbf11b7ea0dfede86c1d2dabcf9f 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -4175,6 +4175,7 @@ PRE(sys_setuid)
 
 PRE(sys_newstat)
 {
+   FUSE_COMPATIBLE_MAY_BLOCK();
    PRINT("sys_newstat ( %#lx(%s), %#lx )", ARG1,(char*)ARG1,ARG2);
    PRE_REG_READ2(long, "stat", char *, file_name, struct stat *, buf);
    PRE_MEM_RASCIIZ( "stat(file_name)", ARG1 );
@@ -4188,6 +4189,7 @@ POST(sys_newstat)
 
 PRE(sys_statfs)
 {
+   FUSE_COMPATIBLE_MAY_BLOCK();
    PRINT("sys_statfs ( %#lx(%s), %#lx )",ARG1,(char*)ARG1,ARG2);
    PRE_REG_READ2(long, "statfs", const char *, path, struct statfs *, buf);
    PRE_MEM_RASCIIZ( "statfs(path)", ARG1 );