Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-21 14:20:24 -07:00
parent e1c837497a 7e004b0643
commit 2980a819e7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/zfs/zfs_ioctl.c
View File

@ -1135,8 +1135,7 @@ zfs_ioc_pool_destroy(struct file *filp, zfs_cmd_t *zc)
{ {
int error; int error;
zfs_log_history(zc); zfs_log_history(zc);
error = zvol_remove_minors(zc->zc_name); (void) zvol_remove_minors(zc->zc_name);
if (error == 0)
error = spa_destroy(zc->zc_name); error = spa_destroy(zc->zc_name);
return (error); return (error);
} }