ctdb-vacuum: extract check for full vacuum run out of ctdb_vacuum_db_full()

This is more consistent.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/server/ctdb_vacuum.c b/ctdb/server/ctdb_vacuum.c
index 6adfa5870aebd7930d10ec3558db00ec71fabbb8..2d41ec4280e88f968e41dac90ae4e582257cc7cf 100644 (file)
--- a/ctdb/server/ctdb_vacuum.c
+++ b/ctdb/server/ctdb_vacuum.c
@@ -765,15 +765,10 @@ static void ctdb_vacuum_db_fast(struct ctdb_db_context *ctdb_db,
  * VacuumFastPathCount times.
  */
 static int ctdb_vacuum_db_full(struct ctdb_db_context *ctdb_db,
-                              struct vacuum_data *vdata,
-                              bool full_vacuum_run)
+                              struct vacuum_data *vdata)
 {
        int ret;
 
-       if (!full_vacuum_run) {
-               return 0;
-       }
-
        ret = tdb_traverse_read(ctdb_db->ltdb->tdb, vacuum_traverse, vdata);
        if (ret == -1 || vdata->traverse_error) {
                DEBUG(DEBUG_ERR, (__location__ " Traverse error in vacuuming "
@@ -1278,9 +1273,11 @@ static int ctdb_vacuum_db(struct ctdb_db_context *ctdb_db,
 
        ctdb_vacuum_db_fast(ctdb_db, vdata);
 
-       ret = ctdb_vacuum_db_full(ctdb_db, vdata, full_vacuum_run);
-       if (ret != 0) {
-               return ret;
+       if (full_vacuum_run) {
+               ret = ctdb_vacuum_db_full(ctdb_db, vdata);
+               if (ret != 0) {
+                       return ret;
+               }
        }
 
        ret = ctdb_process_vacuum_fetch_lists(ctdb_db, vdata);