zfs: bring back possibility to rewind the checkpoint from
Add parsing of the rewind options. When I was upstreaming the change [1], I omitted the part where we detect that the pool should be rewind. When the FreeBSD repo has synced with the OpenZFS, this part of the code was removed. [1] FreeBSD repo:277f38abff
[2] OpenZFS repo:f2c027bd6a
Originally reviewed by: tsoome, allanjude Originally reviewed by: kevans (ok from high-level overview) Signed-off-by: Mariusz Zaborski <oshogbo@vexillium.org> PR: 254152 Reported by: Zhenlei Huang <zlei.huang at gmail.com> Obtained from: https://github.com/openzfs/zfs/pull/11730
This commit is contained in:
parent
59146a6921
commit
653ed678c7
@ -1291,6 +1291,18 @@ getpoolname(const char *osname, char *poolname)
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
fetch_osname_options(char *name, bool *checkpointrewind)
|
||||
{
|
||||
|
||||
if (name[0] == '!') {
|
||||
*checkpointrewind = true;
|
||||
memmove(name, name + 1, strlen(name));
|
||||
} else {
|
||||
*checkpointrewind = false;
|
||||
}
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static int
|
||||
zfs_mount(vfs_t *vfsp)
|
||||
@ -1301,6 +1313,7 @@ zfs_mount(vfs_t *vfsp)
|
||||
char *osname;
|
||||
int error = 0;
|
||||
int canwrite;
|
||||
bool checkpointrewind;
|
||||
|
||||
if (vfs_getopt(vfsp->mnt_optnew, "from", (void **)&osname, NULL))
|
||||
return (SET_ERROR(EINVAL));
|
||||
@ -1314,6 +1327,8 @@ zfs_mount(vfs_t *vfsp)
|
||||
secpolicy_fs_mount_clearopts(cr, vfsp);
|
||||
}
|
||||
|
||||
fetch_osname_options(osname, &checkpointrewind);
|
||||
|
||||
/*
|
||||
* Check for mount privilege?
|
||||
*
|
||||
@ -1392,7 +1407,7 @@ zfs_mount(vfs_t *vfsp)
|
||||
|
||||
error = getpoolname(osname, pname);
|
||||
if (error == 0)
|
||||
error = spa_import_rootpool(pname, false);
|
||||
error = spa_import_rootpool(pname, checkpointrewind);
|
||||
if (error)
|
||||
goto out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user