Date: Sun, 22 Jul 2012 14:33:14 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r238691 - projects/fuse/sys/fs/fuse Message-ID: <201207221433.q6MEXEFg094499@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sun Jul 22 14:33:14 2012 New Revision: 238691 URL: http://svn.freebsd.org/changeset/base/238691 Log: Fix ISDOTDOT lookup that is completely broken by inlining vn_vget_ino() (for using internal nodes handover function). Reported by: pho Tested by: pho Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c Modified: projects/fuse/sys/fs/fuse/fuse_vnops.c ============================================================================== --- projects/fuse/sys/fs/fuse/fuse_vnops.c Sun Jul 22 14:33:04 2012 (r238690) +++ projects/fuse/sys/fs/fuse/fuse_vnops.c Sun Jul 22 14:33:14 2012 (r238691) @@ -933,9 +933,30 @@ calldaemon: goto out; } if (flags & ISDOTDOT) { + struct mount *mp; int ltype; + /* + * Expanded copy of vn_vget_ino() so that + * fuse_vnode_get() can be used. + */ + mp = dvp->v_mount; ltype = VOP_ISLOCKED(dvp); + err = vfs_busy(mp, MBF_NOWAIT); + if (err != 0) { + vfs_ref(mp); + VOP_UNLOCK(dvp, 0); + err = vfs_busy(mp, 0); + vn_lock(dvp, ltype | LK_RETRY); + vfs_rel(mp); + if (err) + goto out; + if ((dvp->v_iflag & VI_DOOMED) != 0) { + err = ENOENT; + vfs_unbusy(mp); + goto out; + } + } VOP_UNLOCK(dvp, 0); err = fuse_vnode_get(vnode_mount(dvp), nid, @@ -943,8 +964,15 @@ calldaemon: &vp, cnp, IFTOVT(fattr->mode)); + vfs_unbusy(mp); vn_lock(dvp, ltype | LK_RETRY); - vref(vp); + if ((dvp->v_iflag & VI_DOOMED) != 0) { + if (err == 0) + vput(vp); + err = ENOENT; + } + if (err) + goto out; *vpp = vp; } else if (nid == VTOI(dvp)) { vref(dvp);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207221433.q6MEXEFg094499>