summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-04-14 15:01:50 +0000
committerpjd <pjd@FreeBSD.org>2007-04-14 15:01:50 +0000
commit92c90b193d40878fc3e959f5e3ca5616e8186931 (patch)
tree1d6bdf71960fd25f8d88ace0331a108dfdc37b86 /sys/contrib
parent2867905cf5fd8d436fd8a9bb7324edcef658356f (diff)
downloadFreeBSD-src-92c90b193d40878fc3e959f5e3ca5616e8186931.zip
FreeBSD-src-92c90b193d40878fc3e959f5e3ca5616e8186931.tar.gz
MFp4: Hmm, it seems to work now.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
index 9dd0b70..4ca8f67 100644
--- a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
+++ b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
@@ -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);
}
OpenPOWER on IntegriCloud