From: S.Çağlar Onur <caglar@10ur.org>
Date: Fri, 22 Aug 2014 16:10:12 +0000 (-0400)
Subject: show additional info if btrfs subvolume deletion fails (issue #315)
X-Git-Tag: lxc-1.1.0.alpha2~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf03f973a8649ac6c74680f788f275f547af51a1;p=thirdparty%2Flxc.git

show additional info if btrfs subvolume deletion fails (issue #315)

Unprivileged users require "-o user_subvol_rm_allowed" mount option for btrfs.
Make the INFO level message to ERROR to make it clear, which now says following;

[caglar@qop:~] lxc-destroy -n rubik
lxc_container: Is the rootfs mounted with -o user_subvol_rm_allowed?
lxc_container: Error destroying rootfs for rubik
Destroying rubik failed

Signed-off-by: S.Çağlar Onur <caglar@10ur.org>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/bdev.c b/src/lxc/bdev.c
index e4b32a124..4fc10f2aa 100644
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1552,7 +1552,7 @@ static int btrfs_do_destroy_subvol(const char *path)
 	ret = ioctl(fd, BTRFS_IOC_SNAP_DESTROY, &args);
 	INFO("btrfs: snapshot destroy ioctl returned %d for %s", ret, path);
 	if (ret < 0 && errno == EPERM)
-		INFO("Is the rootfs mounted with -o user_subvol_rm_allowed?");
+		ERROR("Is the rootfs mounted with -o user_subvol_rm_allowed?");
 
 	free(newfull);
 	close(fd);