diff options
| author | mckusick <mckusick@FreeBSD.org> | 2004-02-23 06:40:17 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2004-02-23 06:40:17 +0000 |
| commit | d1dbb3b2d4e91529168d96b7d8acede795cce9af (patch) | |
| tree | d09e899ec396ffcfb558faedccac37b3504adddd | |
| parent | 7b23d0ae2e6343bdf8f32c112b8122a26ff8b7ae (diff) | |
| download | FreeBSD-src-d1dbb3b2d4e91529168d96b7d8acede795cce9af.zip FreeBSD-src-d1dbb3b2d4e91529168d96b7d8acede795cce9af.tar.gz | |
Change UFS from using vop_stdlock to using its own ufs_lock.
In ufs_lock, check for attempts to acquire shared locks on
snapshot files and change them to be exclusive locks. This
change eliminates deadlocks and machine lockups reported in
-current since most read requests started using shared lock
requests.
Submitted by: Jun Kuriyama <kuriyama@imgsrc.co.jp>
| -rw-r--r-- | sys/ufs/ufs/ufs_vnops.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c index 29e3892..b02b2ad 100644 --- a/sys/ufs/ufs/ufs_vnops.c +++ b/sys/ufs/ufs/ufs_vnops.c @@ -98,6 +98,7 @@ static int ufs_mkdir(struct vop_mkdir_args *); static int ufs_mknod(struct vop_mknod_args *); static int ufs_open(struct vop_open_args *); static int ufs_pathconf(struct vop_pathconf_args *); +static int ufs_lock(struct vop_lock_args *); static int ufs_print(struct vop_print_args *); static int ufs_readlink(struct vop_readlink_args *); static int ufs_remove(struct vop_remove_args *); @@ -1975,6 +1976,32 @@ ufs_strategy(ap) } /* + * Snapshots require all lock requests to be exclusive. + */ +static int +ufs_lock(ap) + struct vop_lock_args /* { + struct vnode *a_vp; + int a_flags; + struct thread *a_td; + } */ *ap; +{ + struct vnode *vp = ap->a_vp; + int flags = ap->a_flags; + + if ((VTOI(vp)->i_flags & SF_SNAPSHOT) && (flags & LK_SHARED)) { + flags &= ~LK_SHARED; + flags |= LK_EXCLUSIVE; + } +#ifndef DEBUG_LOCKS + return (lockmgr(vp->v_vnlock, flags, VI_MTX(vp), ap->a_td)); +#else + return (debuglockmgr(vp->v_vnlock, flags, VI_MTX(vp), + ap->a_td, "vop_stdlock", vp->filename, vp->line)); +#endif +} + +/* * Print out the contents of an inode. */ static int @@ -2673,6 +2700,7 @@ static struct vnodeopv_entry_desc ufs_vnodeop_entries[] = { { &vop_write_desc, (vop_t *) vop_panic }, { &vop_access_desc, (vop_t *) ufs_access }, { &vop_advlock_desc, (vop_t *) ufs_advlock }, + { &vop_lock_desc, (vop_t *) ufs_lock }, { &vop_bmap_desc, (vop_t *) ufs_bmap }, { &vop_cachedlookup_desc, (vop_t *) ufs_lookup }, { &vop_close_desc, (vop_t *) ufs_close }, |
