On Fri, Mar 07, 2014 at 03:41:46PM -0800, Guangyu Sun wrote:
> 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.")
Agreed, EPERM is better.
> Reported-by: Koen De Wit <koen.de.wit@xxxxxxxxxx>
> Signed-off-by: Guangyu Sun <guangyu.sun@xxxxxxxxxx>
> ---
> fs/btrfs/ioctl.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
> index a6d8efa..c380854 100644
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@ -1797,7 +1797,10 @@ static noinline int may_destroy_subvol(struct btrfs_root *root)
> if (di && !IS_ERR(di)) {
> btrfs_dir_item_key_to_cpu(path->nodes[0], di, &key);
> if (key.objectid == root->root_key.objectid) {
> - ret = -ENOTEMPTY;
> + ret = -EPERM;
> + printk(KERN_ERR "subvolume %llu cannot be deleted "
Please use btrfs_err instead of bare printk. The message seems a bit
long to me, how about
"deleting default subvolume %llu is not allowed"
> + "because it is configured as default "
> + "subvolume.\n", key.objectid);
> goto out;
> }
> btrfs_release_path(path);
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
