btrfs-progs: let subvol delete print commit mode inline

There are options to specify if the subvolume deletion should wait for
commit after each subvol or at the end. This is reported at the
beginning and considered as a noise. We'd like to report the mode for
each subvolume instead.

http://www.mail-archive.com/linux-btrfs%40vger.kernel.org/msg34617.html

Reported-by: Marc MERLIN <marc@merlins.org
Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index 53eec46..4e452f4 100644 (file)
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -303,7 +303,9 @@ again:
                goto out;
        }
 
-       printf("Delete subvolume '%s/%s'\n", dname, vname);
+       printf("Delete subvolume (%s): '%s/%s'\n",
+               sync_mode == 2 || (sync_mode == 1 && cnt + 1 == argc)
+               ? "commit" : "no-commit", dname, vname);
        strncpy_null(args.name, vname);
        res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
        e = errno;