util/filemonitor-inotify: Use QEMU_LOCK_GUARD()
PATCH 1/1 util/filemonitor-inotify: Use QEMU_LOCK_GUARD()
Replace manual qemu_mutex_(un)lock() calls withQEMU_LOCK_GUARD() to remove 'goto cleanup' code
Signed-off-by Evgeny Kolmakov <[email protected]>
--- util/filemonitor-inotify.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
util/filemonitor-inotify.c +8 -20
@@ -21,6 +21,7 @@#include "qemu/osdep.h" #include "qemu/filemonitor.h" #include "qemu/main-loop.h" +#include "qemu/lockable.h" #include "qemu/error-report.h" #include "qapi/error.h" #include "trace.h"
@@ -59,10 +60,9 @@ static void qemu_file_monitor_watch(void *arg)int used =0 ;int len; -qemu_mutex_lock (&mon->lock); +QEMU_LOCK_GUARD (&mon->lock);if (mon->fd ==-1 ) { -qemu_mutex_unlock (&mon->lock);return ; }
@@ -72,11 +72,10 @@ static void qemu_file_monitor_watch(void *arg)if (errno !=EAGAIN ) {error_report ("Failure monitoring inotify FD '%s'," "disabling events" ,strerror (errno)); - goto cleanup; }/* no more events right now */ - goto cleanup; +return ; }/* Loop over all events in the buffer */
@@ -151,9 +150,6 @@ static void qemu_file_monitor_watch(void *arg) } } } - - cleanup: -qemu_mutex_unlock (&mon->lock); }
@@ -257,9 +253,8 @@ qemu_file_monitor_add_watch(QFileMonitor *mon, {QFileMonitorDir *dir;QFileMonitorWatch watch; -int64_t ret =-1 ; -qemu_mutex_lock (&mon->lock); +QEMU_LOCK_GUARD (&mon->lock); dir =g_hash_table_lookup (mon->dirs, dirpath);if (!dir) { int rv = inotify_add_watch(mon->fd, dirpath,
@@ -268,7 +263,7 @@ qemu_file_monitor_add_watch(QFileMonitor *mon,if (rv <0 ) {error_setg_errno (errp, errno,"Unable to watch '%s'" , dirpath); - goto cleanup; +return -1 ; }trace_qemu_file_monitor_enable_watch (mon, dirpath, rv);
@@ -297,11 +292,7 @@ qemu_file_monitor_add_watch(QFileMonitor *mon, filename ? filename :"<none>" , cb, opaque, watch.id); - ret = watch.id; - - cleanup: -qemu_mutex_unlock (&mon->lock); -return ret; +return watch.id; }
@@ -312,13 +303,13 @@ void qemu_file_monitor_remove_watch(QFileMonitor *mon,QFileMonitorDir *dir;gsize i; -qemu_mutex_lock (&mon->lock); +QEMU_LOCK_GUARD (&mon->lock);trace_qemu_file_monitor_remove_watch (mon, dirpath, id); dir =g_hash_table_lookup (mon->dirs, dirpath);if (!dir) { - goto cleanup; +return ; }for (i =0 ; i < dir->watches->len; i++) {
@@ -342,7 +333,4 @@ void qemu_file_monitor_remove_watch(QFileMonitor *mon,qemu_set_fd_handler (mon->fd,NULL ,NULL ,NULL ); } } - - cleanup: -qemu_mutex_unlock (&mon->lock); }
Signature · 1 line
2.43.0
Quoted 7 lines · Evgeny Kolmakov
Replace manual qemu_mutex_(un)lock() calls with
QEMU_LOCK_GUARD()to remove 'goto cleanup' codeSigned-off-by Evgeny Kolmakov <[email protected]>--- util/filemonitor-inotify.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-)
Reviewed-by Daniel P. Berrangé <[email protected]>
and queued..
With regards,
Daniel
Signature · 3 lines
|: https://berrange.com ~~ https://hachyderm.io/@berrange :| |: https://libvirt.org ~~ https://entangle-photo.org :| |: https://pixelfed.art/berrange ~~ https://fstop138.berrange.com :|