All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] btrfs-progs: subvolume: outputs message only when operation succeeds
@ 2017-09-19  7:41 Misono, Tomohiro
  2017-09-20  2:32 ` Satoru Takeuchi
  2017-09-25  7:30 ` Nikolay Borisov
  0 siblings, 2 replies; 19+ messages in thread
From: Misono, Tomohiro @ 2017-09-19  7:41 UTC (permalink / raw)
  To: linux-btrfs

"btrfs subvolume create/delete" outputs the message of "Create/Delete
subvolume ..." even when an operation fails.
Since it is confusing, let's outputs the message only when an operation succeeds.

Signed-off-by: Tomohiro Misono <misono.tomohiro@jp.fujitsu.com>
---
 cmds-subvolume.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmds-subvolume.c b/cmds-subvolume.c
index 666f6e0..6d4b0fe 100644
--- a/cmds-subvolume.c
+++ b/cmds-subvolume.c
@@ -189,7 +189,6 @@ static int cmd_subvol_create(int argc, char **argv)
 	if (fddst < 0)
 		goto out;
 
-	printf("Create subvolume '%s/%s'\n", dstdir, newname);
 	if (inherit) {
 		struct btrfs_ioctl_vol_args_v2	args;
 
@@ -213,6 +212,7 @@ static int cmd_subvol_create(int argc, char **argv)
 		error("cannot create subvolume: %s", strerror(errno));
 		goto out;
 	}
+	printf("Create subvolume '%s/%s'\n", dstdir, newname);
 
 	retval = 0;	/* success */
 out:
@@ -337,9 +337,6 @@ again:
 		goto out;
 	}
 
-	printf("Delete subvolume (%s): '%s/%s'\n",
-		commit_mode == 2 || (commit_mode == 1 && cnt + 1 == argc)
-		? "commit" : "no-commit", dname, vname);
 	memset(&args, 0, sizeof(args));
 	strncpy_null(args.name, vname);
 	res = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
@@ -349,6 +346,9 @@ again:
 		ret = 1;
 		goto out;
 	}
+	printf("Delete subvolume (%s): '%s/%s'\n",
+		commit_mode == 2 || (commit_mode == 1 && cnt + 1 == argc)
+		? "commit" : "no-commit", dname, vname);
 
 	if (commit_mode == 1) {
 		res = wait_for_commit(fd);
-- 
2.9.5


^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2017-09-27 14:06 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-09-19  7:41 [PATCH] btrfs-progs: subvolume: outputs message only when operation succeeds Misono, Tomohiro
2017-09-20  2:32 ` Satoru Takeuchi
2017-09-25  7:30 ` Nikolay Borisov
2017-09-25  7:42   ` Marat Khalili
2017-09-25  7:43     ` Hugo Mills
2017-09-25  7:46     ` Qu Wenruo
2017-09-25  7:52       ` Hugo Mills
2017-09-25  8:04         ` Qu Wenruo
2017-09-25  8:08           ` Qu Wenruo
2017-09-25  9:27             ` Marat Khalili
2017-09-25 14:19           ` Hugo Mills
2017-09-25 14:33             ` Qu Wenruo
2017-09-25 15:17               ` Marat Khalili
2017-09-25 16:11                 ` Wrong device? linux-btrfs
2017-09-26  7:31                   ` Lukas Pirl
2017-09-27 14:06                     ` Andrei Borzenkov
2017-09-26  8:06                   ` Duncan
2017-09-27  8:26                     ` Ari Saastamoinen
2017-09-25  9:11         ` [PATCH] btrfs-progs: subvolume: outputs message only when operation succeeds Marat Khalili

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.