Skip to content
Snippets Groups Projects
Commit e4fd889f authored by Mahmoud Mandour's avatar Mahmoud Mandour Committed by Christian Schoenebeck
Browse files

hw/9pfs/9p-synth: Replaced qemu_mutex_lock with QEMU_LOCK_GUARD


Replaced a call to qemu_mutex_lock and its respective call to
qemu_mutex_unlock and used QEMU_LOCK_GUARD macro in their place.
This simplifies the code by removing the call required to unlock
and also eliminates goto paths.

Signed-off-by: default avatarMahmoud Mandour <ma.mandourr@gmail.com>
Acked-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarChristian Schoenebeck <qemu_oss@crudebyte.com>
Message-Id: <20210311031538.5325-9-ma.mandourr@gmail.com>
Signed-off-by: default avatarChristian Schoenebeck <qemu_oss@crudebyte.com>
parent 2615a5e4
No related branches found
No related tags found
No related merge requests found
......@@ -79,11 +79,11 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode,
if (!parent) {
parent = &synth_root;
}
qemu_mutex_lock(&synth_mutex);
QEMU_LOCK_GUARD(&synth_mutex);
QLIST_FOREACH(tmp, &parent->child, sibling) {
if (!strcmp(tmp->name, name)) {
ret = EEXIST;
goto err_out;
return ret;
}
}
/* Add the name */
......@@ -94,8 +94,6 @@ int qemu_v9fs_synth_mkdir(V9fsSynthNode *parent, int mode,
node->attr, node->attr->inode);
*result = node;
ret = 0;
err_out:
qemu_mutex_unlock(&synth_mutex);
return ret;
}
......@@ -116,11 +114,11 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode,
parent = &synth_root;
}
qemu_mutex_lock(&synth_mutex);
QEMU_LOCK_GUARD(&synth_mutex);
QLIST_FOREACH(tmp, &parent->child, sibling) {
if (!strcmp(tmp->name, name)) {
ret = EEXIST;
goto err_out;
return ret;
}
}
/* Add file type and remove write bits */
......@@ -136,8 +134,6 @@ int qemu_v9fs_synth_add_file(V9fsSynthNode *parent, int mode,
pstrcpy(node->name, sizeof(node->name), name);
QLIST_INSERT_HEAD_RCU(&parent->child, node, sibling);
ret = 0;
err_out:
qemu_mutex_unlock(&synth_mutex);
return ret;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment