diff options
| author | Nikolay Sturm <sturm@cvs.openbsd.org> | 2006-04-30 14:20:09 +0000 |
|---|---|---|
| committer | Nikolay Sturm <sturm@cvs.openbsd.org> | 2006-04-30 14:20:09 +0000 |
| commit | a4cb7d48e5f539c9c6c8918d25916b5fac8dcd8a (patch) | |
| tree | f86b662368f0d39c80089283db45fbc7db35c09f /sys/ufs | |
| parent | dba3801a71db41c05ec0bfd759e004548d5e3eca (diff) | |
remove the simplelock argument from vfs_busy() which is currently not
used and will never be used this way in VFS
requested by and ok pedro, ok krw, biorn
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 4 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_quota.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 6f4d3bbfc27..1b826228a1e 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mfs_vfsops.c,v 1.31 2006/04/19 11:55:55 pedro Exp $ */ +/* $OpenBSD: mfs_vfsops.c,v 1.32 2006/04/30 14:20:08 sturm Exp $ */ /* $NetBSD: mfs_vfsops.c,v 1.10 1996/02/09 22:31:28 christos Exp $ */ /* @@ -263,7 +263,7 @@ mfs_start(struct mount *mp, int flags, struct proc *p) * EINTR/ERESTART. */ if (sleepreturn != 0) { - if (vfs_busy(mp, LK_EXCLUSIVE|LK_NOWAIT, NULL) || + if (vfs_busy(mp, LK_EXCLUSIVE|LK_NOWAIT) || dounmount(mp, 0, p, NULL)) CLRSIG(p, CURSIG(p)); sleepreturn = 0; diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index a1413f7d5f7..3b00eddb730 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_quota.c,v 1.22 2005/12/28 20:48:18 pedro Exp $ */ +/* $OpenBSD: ufs_quota.c,v 1.23 2006/04/30 14:20:08 sturm Exp $ */ /* $NetBSD: ufs_quota.c,v 1.8 1996/02/09 22:36:09 christos Exp $ */ /* @@ -1028,7 +1028,7 @@ ufs_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t arg, if ((u_int)type >= MAXQUOTAS) return (EINVAL); - if (vfs_busy(mp, LK_NOWAIT, NULL)) + if (vfs_busy(mp, LK_NOWAIT)) return (0); |