From d9e2daaf3d8649650cf9784b4fe9d9de4507da0c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 6 Apr 2015 10:57:17 +0200
Subject: btrfs: support recursively removing btrfs snapshots

---
 src/import/import-raw.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/import/import-raw.c')

diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 3a315139e5..ad8f806aff 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -241,10 +241,8 @@ static int raw_import_finish(RawImport *i) {
                         return r;
         }
 
-        if (i->force_local) {
-                (void) btrfs_subvol_remove(i->final_path);
-                (void) rm_rf(i->final_path, REMOVE_ROOT|REMOVE_PHYSICAL);
-        }
+        if (i->force_local)
+                (void) rm_rf(i->final_path, REMOVE_ROOT|REMOVE_PHYSICAL|REMOVE_SUBVOLUME);
 
         r = rename_noreplace(AT_FDCWD, i->temp_path, AT_FDCWD, i->final_path);
         if (r < 0)
-- 
cgit v1.2.3-54-g00ecf