mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-29 16:44:03 +00:00
Code Issues Releases Activity

Change UFS from using vop_stdlock to using its own ufs_lock.

Browse Source 
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>
This commit is contained in:
Kirk McKusick 2004-02-23 06:40:17 +00:00
parent 75207c7a43
commit 6c053cec34
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=126153
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/ufs/ufs/ufs_vnops.c
View File

@ -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 *);
@ -1974,6 +1975,32 @@ ufs_strategy(ap)
return (0);
}
/*
* 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.
*/
@ -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 },