src/cli_rm.cpp

@@ -137,8 +137,6 @@ resume_2:
                 state = 100;
                 return;
             }
-            else if (parent->progress)
-                printf("%s\n", result.text.c_str());
             parent->change_parent(merge_children[current_child], new_parent, &result);
             state = 3;
 resume_3:
@@ -170,8 +168,6 @@ resume_4:
                 state = 100;
                 return;
             }
-            else if (parent->progress)
-                printf("%s\n", result.text.c_str());
             // Delete "inverse" child data
             start_delete_source(inverse_child);
             if (state == 100)
@@ -188,8 +184,6 @@ resume_5:
                 state = 100;
                 return;
             }
-            else if (parent->progress)
-                printf("%s\n", result.text.c_str());
             // Delete "inverse" child metadata, rename parent over it,
             // and also change parent links of the previous "inverse" child
             rename_inverse_parent();
@@ -218,8 +212,6 @@ resume_7:
                 state = 100;
                 return;
             }
-            else if (parent->progress)
-                printf("%s\n", result.text.c_str());
             delete_inode_config(chain_list[current_child]);
             if (state == 100)
                 return;

src/cli_rm_data.cpp

@@ -183,18 +183,6 @@ struct rm_inode_t
         }
         if (lists_done && !lists.size())
         {
-            if (parent->progress && total_count > 0)
-            {
-                fprintf(stderr, "\n");
-            }
-            if (parent->progress && (total_done < total_count || inactive_osds.size() > 0))
-            {
-                fprintf(
-                    stderr, "Warning: Pool:%u,ID:%lu inode data may not have been fully removed.\n"
-                    " Use `vitastor-cli rm-data --pool %u --inode %lu` if you encounter it in listings.\n",
-                    pool_id, INODE_NO_POOL(inode), pool_id, INODE_NO_POOL(inode)
-                );
-            }
             result = (cli_result_t){
                 .err = error_count > 0 ? EIO : 0,
                 .text = error_count > 0 ? "Some blocks were not removed" : (
@@ -207,6 +195,10 @@ struct rm_inode_t
                 },
             };
             state = 100;
+            if (parent->progress && total_count > 0)
+            {
+                fprintf(stderr, "\n");
+            }
         }
     }