diff options
| author | mm <mm@FreeBSD.org> | 2010-09-14 12:12:18 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-09-14 12:12:18 +0000 |
| commit | 9525362ceeccf6887d11f6652a99c34f347d80cc (patch) | |
| tree | 4ddfc71f82560722be3847714e26f102781f51db /sys/cddl | |
| parent | e687b4009f69e97c6a7d3186844737d3b7ef91b2 (diff) | |
| download | FreeBSD-src-9525362ceeccf6887d11f6652a99c34f347d80cc.zip FreeBSD-src-9525362ceeccf6887d11f6652a99c34f347d80cc.tar.gz | |
Remove duplicated VFS_HOLD due to a mismerge.
PR: kern/150544
Approved by: delphij (mentor)
MFC after: 1 day
Diffstat (limited to 'sys/cddl')
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c index 15f8767..96c9734 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c @@ -1226,13 +1226,6 @@ zfs_mount(vfs_t *vfsp) if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap) VFS_HOLD(mvp->v_vfsp); - /* - * Add an extra VFS_HOLD on our parent vfs so that it can't - * disappear due to a forced unmount. - */ - if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap) - VFS_HOLD(mvp->v_vfsp); - out: return (error); } |
