Btrfs: return EPERM when deleting a default subvolume

The error message is confusing:

 # btrfs sub delete /mnt/mysub/
 Delete subvolume '/mnt/mysub'
 ERROR: cannot delete '/mnt/mysub' - Directory not empty

The error message does not make sense to me: It's not about deleting a
directory but it's a subvolume, and it doesn't matter if the subvolume is
empty or not.

Maybe EPERM or is more appropriate in this case, combined with an explanatory
kernel log message. (e.g. "subvolume with ID 123 cannot be deleted because
it is configured as default subvolume.")

Reported-by: Koen De Wit <koen.de.wit@oracle.com>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Guangyu Sun 2014-03-11 11:24:18 -07:00 коммит произвёл Chris Mason
Родитель ef66af101a
Коммит 72de6b5393
1 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -1858,7 +1858,9 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
if (di && !IS_ERR(di)) { if (di && !IS_ERR(di)) {
btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key); btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);
if (key.objectid == root->root_key.objectid) { if (key.objectid == root->root_key.objectid) {
ret = -ENOTEMPTY; ret = -EPERM;
btrfs_err(root->fs_info, "deleting default subvolume "
"%llu is not allowed", key.objectid);
goto out; goto out;
} }
btrfs_release_path(path); btrfs_release_path(path);