[lxc-devel] [lxcfs/master] Revert "bindings: protect do_release_file_info() with mutex"

tomponline on Github lxc-bot at linuxcontainers.org
Tue Jan 22 12:39:55 UTC 2019


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 544 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190122/2b76f2ea/attachment.bin>
-------------- next part --------------
From ba8351c4cf1e3dff8046e49a995c6d9a58f2007d Mon Sep 17 00:00:00 2001
From: tomponline <tomp at tomp.uk>
Date: Tue, 22 Jan 2019 12:38:25 +0000
Subject: [PATCH] Revert "bindings: protect do_release_file_info() with mutex"

This reverts commit 0108dc1cc6eab76392d228ee4ca844729096473d.

I am still experiencing hangs in lxcfs even with this patch.
---
 bindings.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/bindings.c b/bindings.c
index 29855d5..097ca81 100644
--- a/bindings.c
+++ b/bindings.c
@@ -2169,16 +2169,11 @@ int cg_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset
 	return ret;
 }
 
-static pthread_mutex_t do_release_file_info_lock = PTHREAD_MUTEX_INITIALIZER;
-
 static void do_release_file_info(struct fuse_file_info *fi)
 {
-	lock_mutex(&do_release_file_info_lock);
-
 	struct file_info *f = (struct file_info *)fi->fh;
 
 	if (!f)
-		unlock_mutex(&do_release_file_info_lock);
 		return;
 
 	fi->fh = 0;
@@ -2193,8 +2188,6 @@ static void do_release_file_info(struct fuse_file_info *fi)
 	f->buf = NULL;
 	free(f);
 	f = NULL;
-
-	unlock_mutex(&do_release_file_info_lock);
 }
 
 int cg_releasedir(const char *path, struct fuse_file_info *fi)


More information about the lxc-devel mailing list