Date: Sat, 16 May 2009 05:14:36 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r192185 - user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/kern Message-ID: <200905160514.n4G5EasH045277@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Sat May 16 05:14:36 2009 New Revision: 192185 URL: http://svn.freebsd.org/changeset/base/192185 Log: remove dead code and mount lock acquisition that was accidentally merged Modified: user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c Modified: user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c ============================================================================== --- user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c Sat May 16 04:32:59 2009 (r192184) +++ user/kmacy/ZFS_MFC/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c Sat May 16 05:14:36 2009 (r192185) @@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$"); MALLOC_DECLARE(M_MOUNT); - - void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, int flags __unused) @@ -93,52 +91,6 @@ vfs_optionisset(const vfs_t *vfsp, const return (error != 0 ? 0 : 1); } -#if 0 -int -traverse(vnode_t **cvpp) -{ - kthread_t *td = curthread; - vnode_t *cvp; - vnode_t *tvp; - vfs_t *vfsp; - int error; - - cvp = *cvpp; - error = 0; - - /* - * If this vnode is mounted on, then we transparently indirect - * to the vnode which is the root of the mounted file system. - * Before we do this we must check that an unmount is not in - * progress on this vnode. - */ - - for (;;) { - /* - * Reached the end of the mount chain? - */ - vfsp = vn_mountedvfs(cvp); - if (vfsp == NULL) - break; - VN_RELE(cvp); - - /* - * The read lock must be held across the call to VFS_ROOT() to - * prevent a concurrent unmount from destroying the vfs. - */ - error = VFS_ROOT(vfsp, 0, &tvp, td); - if (error) - break; - VOP_UNLOCK(tvp, 0, td); - - cvp = tvp; - } - - *cvpp = cvp; - return (error); -} -#endif - extern struct mount *vfs_mount_alloc(struct vnode *vp, struct vfsconf *vfsp, const char *fspath, struct thread *td); @@ -188,10 +140,7 @@ domount(kthread_t *td, vnode_t *vp, cons /* * Set the mount level flags. - * crdup() can sleep, so do it before acquiring a mutex. */ - cr = crdup(kcred); - MNT_ILOCK(mp); if (fsflags & MNT_RDONLY) mp->mnt_flag |= MNT_RDONLY; mp->mnt_flag &=~ MNT_UPDATEMASK;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905160514.n4G5EasH045277>