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 15c89cc45f73cf5d5a18aa26774b142f75bfec57..449aca20e404757a84e41c4a4b3c28e67fb9de5d 100644 (file)
--- a/src/lxc/bdev.c
+++ b/src/lxc/bdev.c
@@ -1551,7 +1551,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);