Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix zfs_rename to update symlinks under /dev (Fixes #408) #523

Closed
wants to merge 1 commit into from
Closed

Fix zfs_rename to update symlinks under /dev (Fixes #408) #523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 52 additions & 16 deletions lib/libzfs/libzfs_dataset.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3358,6 +3358,20 @@ zfs_create_link_cb(zfs_handle_t *zhp, void *arg)
return (ret);
}

static int
zfs_create_link_snapvol(zfs_handle_t *zhp, void *arg)
{
(void) zvol_create_link_common(zhp->zfs_hdl, zhp->zfs_name, B_TRUE);
return (0);
}

static int
zfs_remove_link_snapvol(zfs_handle_t *zhp, void *arg)
{
(void) zvol_remove_link(zhp->zfs_hdl, zhp->zfs_name);
return (0);
}

/*
* Takes a snapshot of the given dataset.
*/
Expand Down Expand Up @@ -3735,22 +3749,25 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive)
return (zfs_error(hdl, EZFS_ZONED, errbuf));
}

parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name);
if (parentname == NULL) {
ret = -1;
goto error;
}
delim = strchr(parentname, '@');
if (delim != NULL) {
*delim = '\0';
}
zhrp = zfs_open(zhp->zfs_hdl, parentname, ZFS_TYPE_DATASET);
if (zhrp == NULL) {
ret = -1;
printf("zhrp is NULL\n");
goto error;
}

if (recursive) {
struct destroydata dd;

parentname = zfs_strdup(zhp->zfs_hdl, zhp->zfs_name);
if (parentname == NULL) {
ret = -1;
goto error;
}
delim = strchr(parentname, '@');
*delim = '\0';
zhrp = zfs_open(zhp->zfs_hdl, parentname, ZFS_TYPE_DATASET);
if (zhrp == NULL) {
ret = -1;
goto error;
}

dd.snapname = delim + 1;
dd.gotone = B_FALSE;
dd.closezhp = B_TRUE;
Expand All @@ -3777,10 +3794,13 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive)
goto error;
}

if (ZFS_IS_VOLUME(zhp))
if (ZFS_IS_VOLUME(zhp)) {
zc.zc_objset_type = DMU_OST_ZVOL;
else
zc.zc_objset_type = DMU_OST_ZFS;
/* remove udev links */
(void) zfs_iter_snapshots(zhrp, zfs_remove_link_snapvol, NULL);
} else {
zc.zc_objset_type = DMU_OST_ZFS;
}

(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));
(void) strlcpy(zc.zc_value, target, sizeof (zc.zc_value));
Expand Down Expand Up @@ -3817,6 +3837,11 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive)
(void) zfs_iter_filesystems(zhrp, zfs_create_link_cb,
&cd);
} else {
if (ZFS_IS_VOLUME(zhp)) {
/* restore old udev links back */
(void) zfs_iter_snapshots(zhrp,
zfs_create_link_snapvol, NULL);
}
(void) changelist_postfix(cl);
}
} else {
Expand All @@ -3829,6 +3854,17 @@ zfs_rename(zfs_handle_t *zhp, const char *target, boolean_t recursive)
ret = zfs_iter_filesystems(zhrp, zfs_create_link_cb,
&cd);
} else {
if (ZFS_IS_VOLUME(zhp)) {
/* create new udev links */
zhrp = zfs_open(zhp->zfs_hdl, target,
ZFS_TYPE_DATASET);
if (zhrp == NULL) {
ret = -1;
goto error;
}
(void) zfs_iter_snapshots(zhrp,
zfs_create_link_snapvol, NULL);
}
changelist_rename(cl, zfs_get_name(zhp), target);
ret = changelist_postfix(cl);
}
Expand Down