[xen master] tools/xenstore: let db_delete() return void

[patchbot@xxxxxxx]

commit f39c39ba2585df9cc0a8a9a963fa2dd07dc31c86
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Mon Aug 14 09:46:54 2023 +0200
Commit:     Julien Grall <jgrall@xxxxxxxxxx>
CommitDate: Fri Aug 18 13:44:48 2023 +0100

    tools/xenstore: let db_delete() return void
    
    db_delete() only ever is returning 0. Switch it to return void and
    remove all the error handling dealing wit a non-zero return value.
    
    Suggested-by: Julien Grall <julien@xxxxxxx>
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
---
 tools/xenstore/xenstored_core.c        | 11 ++++-------
 tools/xenstore/xenstored_core.h        |  4 ++--
 tools/xenstore/xenstored_transaction.c | 14 +++++---------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 2b94392fd4..a08962c3ea 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -677,8 +677,8 @@ int db_write(struct connection *conn, const char *db_name, 
void *data,
        return 0;
 }
 
-int db_delete(struct connection *conn, const char *name,
-             struct node_account_data *acc)
+void db_delete(struct connection *conn, const char *name,
+              struct node_account_data *acc)
 {
        struct node_account_data tmp_acc;
        unsigned int domid;
@@ -698,8 +698,6 @@ int db_delete(struct connection *conn, const char *name,
                domain_memory_add_nochk(conn, domid,
                                        -acc->memory - strlen(name));
        }
-
-       return 0;
 }
 
 /*
@@ -1670,9 +1668,8 @@ static int delnode_sub(const void *ctx, struct connection 
*conn,
        if (domain_nbentry_dec(conn, get_node_owner(node)))
                return WALK_TREE_ERROR_STOP;
 
-       /* In case of error stop the walk. */
-       if (!ret && db_delete(conn, db_name, &node->acc))
-               return WALK_TREE_ERROR_STOP;
+       if (!ret)
+               db_delete(conn, db_name, &node->acc);
 
        /*
         * Fire the watches now, when we can still see the node permissions.
diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index ce40c61f44..e1aeb4aecd 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -366,8 +366,8 @@ struct xs_tdb_record_hdr *db_fetch(const char *db_name, 
size_t *size);
 int db_write(struct connection *conn, const char *db_name, void *data,
             size_t size, struct node_account_data *acc,
             enum write_node_mode mode, bool no_quota_check);
-int db_delete(struct connection *conn, const char *name,
-             struct node_account_data *acc);
+void db_delete(struct connection *conn, const char *name,
+              struct node_account_data *acc);
 
 void conn_free_buffered_data(struct connection *conn);
 
diff --git a/tools/xenstore/xenstored_transaction.c 
b/tools/xenstore/xenstored_transaction.c
index 378fe79763..fbcea3663e 100644
--- a/tools/xenstore/xenstored_transaction.c
+++ b/tools/xenstore/xenstored_transaction.c
@@ -377,10 +377,8 @@ static int finalize_transaction(struct connection *conn,
 
                /* Entries for unmodified nodes can be removed early. */
                if (!i->modified) {
-                       if (i->ta_node) {
-                               if (db_delete(conn, i->trans_name, NULL))
-                                       return EIO;
-                       }
+                       if (i->ta_node)
+                               db_delete(conn, i->trans_name, NULL);
                        list_del(&i->list);
                        talloc_free(i);
                }
@@ -397,8 +395,7 @@ static int finalize_transaction(struct connection *conn,
                                       ? NODE_CREATE : NODE_MODIFY;
                                *is_corrupt |= db_write(conn, i->node, hdr,
                                                        size, NULL, mode, true);
-                               if (db_delete(conn, i->trans_name, NULL))
-                                       *is_corrupt = true;
+                               db_delete(conn, i->trans_name, NULL);
                        } else {
                                *is_corrupt = true;
                        }
@@ -408,9 +405,8 @@ static int finalize_transaction(struct connection *conn,
                         * in this transaction will have no generation
                         * information stored.
                         */
-                       *is_corrupt |= (i->generation == NO_GENERATION)
-                                      ? false
-                                      : db_delete(conn, i->node, NULL);
+                       if (i->generation != NO_GENERATION)
+                               db_delete(conn, i->node, NULL);
                }
                if (i->fire_watch)
                        fire_watches(conn, trans, i->node, NULL, i->watch_exact,
--
generated by git-patchbot for /home/xen/git/xen.git#master