Date: Sat, 12 Sep 2009 18:02:57 +0000 (UTC) From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r197123 - in stable/8/sys: . amd64/include/xen cddl/contrib/opensolaris contrib/dev/acpica contrib/pf dev/xen/xenpci kern Message-ID: <200909121802.n8CI2vJp093176@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kib Date: Sat Sep 12 18:02:57 2009 New Revision: 197123 URL: http://svn.freebsd.org/changeset/base/197123 Log: MFC r197030: In vfs_mark_atime(9), be resistent against reclaimed vnodes. Assert that neccessary locks are taken, since vop might not be called. Approved by: re (kensmith) Modified: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) stable/8/sys/kern/vfs_subr.c Modified: stable/8/sys/kern/vfs_subr.c ============================================================================== --- stable/8/sys/kern/vfs_subr.c Sat Sep 12 17:58:15 2009 (r197122) +++ stable/8/sys/kern/vfs_subr.c Sat Sep 12 18:02:57 2009 (r197123) @@ -4269,8 +4269,12 @@ vfs_read_dirent(struct vop_readdir_args void vfs_mark_atime(struct vnode *vp, struct ucred *cred) { + struct mount *mp; - if ((vp->v_mount->mnt_flag & (MNT_NOATIME | MNT_RDONLY)) == 0) + mp = vp->v_mount; + VFS_ASSERT_GIANT(mp); + ASSERT_VOP_LOCKED(vp, "vfs_mark_atime"); + if (mp != NULL && (mp->mnt_flag & (MNT_NOATIME | MNT_RDONLY)) == 0) (void)VOP_MARKATIME(vp); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909121802.n8CI2vJp093176>