d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4: Hmm, it seems to work now.

Browse Source
This commit is contained in:
Pawel Jakub Dawidek 2007-04-14 15:01:50 +00:00
parent 01498c0b83
commit d48078479c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=168724
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -474,14 +474,7 @@ zfs_domount(vfs_t *vfsp, char *osname, kthread_t *td)
error = dmu_objset_open(osname, DMU_OST_ZFS, mode, &zfsvfs->z_os);
if (error == EROFS) {
/*
* FreeBSD: In Solaris there is DS_MODE_PRIMARY instead of
* DS_MODE_STANDARD, but it doesn't work on FreeBSD and
* I don't know why. It looks like the dataset is opened
* on mount DS_MODE_PRIMARY mode and snapshot cannot open
* the same dataset in DS_MODE_PRIMARY mode again.
*/
mode = DS_MODE_STANDARD | DS_MODE_READONLY;
mode = DS_MODE_PRIMARY | DS_MODE_READONLY;
error = dmu_objset_open(osname, DMU_OST_ZFS, mode,
&zfsvfs->z_os);
}

9
sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -474,14 +474,7 @@ zfs_domount(vfs_t *vfsp, char *osname, kthread_t *td)
error = dmu_objset_open(osname, DMU_OST_ZFS, mode, &zfsvfs->z_os);
if (error == EROFS) {
/*
* FreeBSD: In Solaris there is DS_MODE_PRIMARY instead of
* DS_MODE_STANDARD, but it doesn't work on FreeBSD and
* I don't know why. It looks like the dataset is opened
* on mount DS_MODE_PRIMARY mode and snapshot cannot open
* the same dataset in DS_MODE_PRIMARY mode again.
*/
mode = DS_MODE_STANDARD | DS_MODE_READONLY;
mode = DS_MODE_PRIMARY | DS_MODE_READONLY;
error = dmu_objset_open(osname, DMU_OST_ZFS, mode,
&zfsvfs->z_os);
}