diff options
| author | Brian Behlendorf <[email protected]> | 2017-03-08 19:56:09 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-03-10 09:51:41 -0800 |
| commit | 1c2555ef926521671eaca918f0aaaa97dbef02af (patch) | |
| tree | 6491e5bdda80532388091def591f7ee9e59b6271 /module/zfs/zfs_ctldir.c | |
| parent | f298b24ddf9695fb74603a257e2a58dd7baf0159 (diff) | |
Restructure mount option handling
Restructure the handling of mount options to be consistent with
upstream OpenZFS. This required making the following changes.
- The zfs_mntopts_t was renamed vfs_t and adjusted to provide
the minimal needed functionality. This includes a pointer
back to the associated zfsvfs_t. Plus it made it possible
to revert zfs_register_callbacks() and zfsvfs_create() back
to their original prototypes.
- A zfs_mnt_t structure was added for the sole purpose of
providing a structure to pass the osname and raw mount
pointer to zfs_domount() without having to copy them.
- Mount option parsing was moved down from the zpl_* wrapper
functions in to the zfs_* functions. This allowed for the
code to be simplied and it's where similar functionality
appears on other platforms.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/zfs/zfs_ctldir.c')
| -rw-r--r-- | module/zfs/zfs_ctldir.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c index 5d713f6d7..eea1bb2e8 100644 --- a/module/zfs/zfs_ctldir.c +++ b/module/zfs/zfs_ctldir.c @@ -746,7 +746,7 @@ zfsctl_snapshot_path_objset(zfsvfs_t *zfsvfs, uint64_t objsetid, uint64_t id, pos = 0; int error = 0; - if (zfsvfs->z_mntopts->z_mntpoint == NULL) + if (zfsvfs->z_vfs->vfs_mntpoint == NULL) return (ENOENT); cookie = spl_fstrans_mark(); @@ -767,7 +767,7 @@ zfsctl_snapshot_path_objset(zfsvfs_t *zfsvfs, uint64_t objsetid, memset(full_path, 0, path_len); snprintf(full_path, path_len - 1, "%s/.zfs/snapshot/%s", - zfsvfs->z_mntopts->z_mntpoint, snapname); + zfsvfs->z_vfs->vfs_mntpoint, snapname); out: kmem_free(snapname, ZFS_MAX_DATASET_NAME_LEN); spl_fstrans_unmark(cookie); |