diff options
| author | Andrey Vesnovaty <[email protected]> | 2013-11-26 16:21:23 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-03-20 11:00:48 -0700 |
| commit | 00fcdee1f88f5f1413913f26ebd1cc43107e82e0 (patch) | |
| tree | fd36b27064a48f4508495c35b7d0540e0f246668 /module/zfs/zfs_ioctl.c | |
| parent | e2282ef57edc79cdce2a4b9b7e3333c56494a807 (diff) | |
Fix regression introduced in port of Illumos #3744
Remove the redundant call to zfs_unmount_snap() which was being
done after char array was freed,
This fixes an upstream regression that was introduced in commit
zfsonlinux/zfs@d09f25dc66774959499a89bf3680d09c6e541ce8, which
ported the Illumos 3744 changes.
Signed-off-by: Andrey Vesnovaty <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Closes #2156
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index a061978dc..5951bc673 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -3494,11 +3494,13 @@ recursive_unmount(const char *fsname, void *arg) { const char *snapname = arg; char *fullname; + int error; fullname = kmem_asprintf("%s@%s", fsname, snapname); - zfs_unmount_snap(fullname); + error = zfs_unmount_snap(fullname); strfree(fullname); - return (zfs_unmount_snap(fullname)); + + return (error); } /* |