diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-23 10:50:53 +0200 |
| commit | 952b4473bc392652b1d4c9dae5ec88fd003c4e1d (patch) | |
| tree | 8d27afa9b27ceb997013868f2b80a4bb5a993911 /src/basic/rm-rf.c | |
| parent | c9fc270e462bf2f4eab963bf71234d64b0c4c30f (diff) | |
| parent | b0830e21f47109d8a6ba2fc0afbf9b2ca1ffc2a9 (diff) | |
Merge pull request #1641 from poettering/btrfs-quota
btrfs quota beef up and various other unrelated changes
Diffstat (limited to 'src/basic/rm-rf.c')
| -rw-r--r-- | src/basic/rm-rf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c index dbbe817684..2ef63799d7 100644 --- a/src/basic/rm-rf.c +++ b/src/basic/rm-rf.c @@ -120,7 +120,7 @@ int rm_rf_children(int fd, RemoveFlags flags, struct stat *root_dev) { /* This could be a subvolume, try to remove it */ - r = btrfs_subvol_remove_fd(fd, de->d_name, true); + r = btrfs_subvol_remove_fd(fd, de->d_name, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA); if (r < 0) { if (r != -ENOTTY && r != -EINVAL) { if (ret == 0) @@ -178,7 +178,7 @@ int rm_rf(const char *path, RemoveFlags flags) { if ((flags & (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) == (REMOVE_SUBVOLUME|REMOVE_ROOT|REMOVE_PHYSICAL)) { /* Try to remove as subvolume first */ - r = btrfs_subvol_remove(path, true); + r = btrfs_subvol_remove(path, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA); if (r >= 0) return r; |