commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[hurd] 04/07: Revert "trans: fix locking issue in fakeroot"


From: Samuel Thibault
Subject: [hurd] 04/07: Revert "trans: fix locking issue in fakeroot"
Date: Thu, 06 Feb 2014 02:05:11 +0000

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 801256914d42b3aa4bb0af22432471b1d911a66c
Author: Richard Braun <address@hidden>
Date:   Wed Feb 5 23:57:40 2014 +0100

    Revert "trans: fix locking issue in fakeroot"
    
    This reverts commit 672005782e57e049c7c8f4d6d0b2a80c0df512b4.
    
    That change is apparently not needed and introduced a deadlock.
    
    * trans/fakeroot.c (netfs_attempt_mkfile): Unlock directory node before
    creating new node.
---
 trans/fakeroot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/trans/fakeroot.c b/trans/fakeroot.c
index 3dce22e..b79a37d 100644
--- a/trans/fakeroot.c
+++ b/trans/fakeroot.c
@@ -670,11 +670,11 @@ netfs_attempt_mkfile (struct iouser *user, struct node 
*dir,
   file_t newfile;
   error_t err = dir_mkfile (dir->nn->file, O_RDWR|O_EXEC,
                            real_from_fake_mode (mode), &newfile);
+  pthread_mutex_unlock (&dir->lock);
   if (err == 0)
     err = new_node (newfile, MACH_PORT_NULL, 0, O_RDWR|O_EXEC, np);
   if (err == 0)
     pthread_mutex_unlock (&(*np)->lock);
-  pthread_mutex_unlock (&dir->lock);
   return err;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git



reply via email to

[Prev in Thread] Current Thread [Next in Thread]