d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UFS_UPDATE() takes a boolean `waitfor' arg, so don't pass it the value

Browse Source 
MNT_WAIT when we mean boolean `true' or check for that value not being
passed.  There was no problem in practice because MNT_WAIT had the
magic value of 1.
This commit is contained in:
Bruce Evans 1999-01-06 18:18:06 +00:00
parent eec1dbe6ce
commit 4591d9bb7e
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/sys/softupdates/ffs_softdep.c
View File

@ -54,7 +54,7 @@
* SUCH DAMAGE.
*
* from: @(#)ffs_softdep.c 9.28 (McKusick) 8/8/98
* $Id: ffs_softdep.c,v 1.17 1998/10/31 15:33:32 peter Exp $
* $Id: ffs_softdep.c,v 1.18 1998/12/10 20:11:47 julian Exp $
*/
/*
@ -3463,7 +3463,7 @@ void
softdep_update_inodeblock(ip, bp, waitfor)
struct inode *ip; /* the "in_core" copy of the inode */
struct buf *bp; /* the buffer containing the inode block */
int waitfor; /* 1 => update must be allowed */
int waitfor; /* nonzero => update must be allowed */
{
struct inodedep *inodedep;
struct worklist *wk;
@ -3655,7 +3655,7 @@ softdep_fsync(vp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT)) {
if (error = UFS_UPDATE(pvp, &tv, &tv, 1)) {
vput(pvp);
return (error);
}
@ -4028,7 +4028,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
getmicrotime(&tv);
#endif /* __FreeBSD__ */
FREE_LOCK(&lk);
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT))
if (error = UFS_UPDATE(pvp, &tv, &tv, 1))
break;
ACQUIRE_LOCK(&lk);
/*
@ -4115,7 +4115,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
error = UFS_UPDATE(vp, &tv, &tv, MNT_WAIT);
error = UFS_UPDATE(vp, &tv, &tv, 1);
vput(vp);
if (error)
break;

10
sys/contrib/softupdates/ffs_softdep.c
View File

@ -54,7 +54,7 @@
* SUCH DAMAGE.
*
* from: @(#)ffs_softdep.c 9.28 (McKusick) 8/8/98
* $Id: ffs_softdep.c,v 1.17 1998/10/31 15:33:32 peter Exp $
* $Id: ffs_softdep.c,v 1.18 1998/12/10 20:11:47 julian Exp $
*/
/*
@ -3463,7 +3463,7 @@ void
softdep_update_inodeblock(ip, bp, waitfor)
struct inode *ip; /* the "in_core" copy of the inode */
struct buf *bp; /* the buffer containing the inode block */
int waitfor; /* 1 => update must be allowed */
int waitfor; /* nonzero => update must be allowed */
{
struct inodedep *inodedep;
struct worklist *wk;
@ -3655,7 +3655,7 @@ softdep_fsync(vp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT)) {
if (error = UFS_UPDATE(pvp, &tv, &tv, 1)) {
vput(pvp);
return (error);
}
@ -4028,7 +4028,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
getmicrotime(&tv);
#endif /* __FreeBSD__ */
FREE_LOCK(&lk);
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT))
if (error = UFS_UPDATE(pvp, &tv, &tv, 1))
break;
ACQUIRE_LOCK(&lk);
/*
@ -4115,7 +4115,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
error = UFS_UPDATE(vp, &tv, &tv, MNT_WAIT);
error = UFS_UPDATE(vp, &tv, &tv, 1);
vput(vp);
if (error)
break;

2
sys/gnu/ext2fs/ext2_alloc.c
View File

@ -341,7 +341,7 @@ return ENOSPC;
ip->i_flag |= IN_CHANGE | IN_UPDATE;
if (!doasyncfree) {
gettime(&tv);
UFS_UPDATE(vp, &tv, &tv, MNT_WAIT);
UFS_UPDATE(vp, &tv, &tv, 1);
}
}
if (ssize < len)

2
sys/gnu/fs/ext2fs/ext2_alloc.c
View File

@ -341,7 +341,7 @@ return ENOSPC;
ip->i_flag |= IN_CHANGE | IN_UPDATE;
if (!doasyncfree) {
gettime(&tv);
UFS_UPDATE(vp, &tv, &tv, MNT_WAIT);
UFS_UPDATE(vp, &tv, &tv, 1);
}
}
if (ssize < len)

4
sys/ufs/ffs/ffs_inode.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)ffs_inode.c 8.13 (Berkeley) 4/21/95
* $Id: ffs_inode.c,v 1.49 1998/10/31 15:31:27 peter Exp $
* $Id: ffs_inode.c,v 1.50 1999/01/06 16:52:38 bde Exp $
*/
#include "opt_quota.h"
@ -83,7 +83,7 @@ ffs_update(vp, access, modify, waitfor)
ufs_itimes(vp);
ip = VTOI(vp);
if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor != MNT_WAIT)
if ((ip->i_flag & IN_MODIFIED) == 0 && waitfor == 0)
return (0);
ip->i_flag &= ~(IN_LAZYMOD | IN_MODIFIED);
if (vp->v_mount->mnt_flag & MNT_RDONLY)

10
sys/ufs/ffs/ffs_softdep.c
View File

@ -54,7 +54,7 @@
* SUCH DAMAGE.
*
* from: @(#)ffs_softdep.c 9.28 (McKusick) 8/8/98
* $Id: ffs_softdep.c,v 1.17 1998/10/31 15:33:32 peter Exp $
* $Id: ffs_softdep.c,v 1.18 1998/12/10 20:11:47 julian Exp $
*/
/*
@ -3463,7 +3463,7 @@ void
softdep_update_inodeblock(ip, bp, waitfor)
struct inode *ip; /* the "in_core" copy of the inode */
struct buf *bp; /* the buffer containing the inode block */
int waitfor; /* 1 => update must be allowed */
int waitfor; /* nonzero => update must be allowed */
{
struct inodedep *inodedep;
struct worklist *wk;
@ -3655,7 +3655,7 @@ softdep_fsync(vp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT)) {
if (error = UFS_UPDATE(pvp, &tv, &tv, 1)) {
vput(pvp);
return (error);
}
@ -4028,7 +4028,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
getmicrotime(&tv);
#endif /* __FreeBSD__ */
FREE_LOCK(&lk);
if (error = UFS_UPDATE(pvp, &tv, &tv, MNT_WAIT))
if (error = UFS_UPDATE(pvp, &tv, &tv, 1))
break;
ACQUIRE_LOCK(&lk);
/*
@ -4115,7 +4115,7 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
#else
getmicrotime(&tv);
#endif /* __FreeBSD__ */
error = UFS_UPDATE(vp, &tv, &tv, MNT_WAIT);
error = UFS_UPDATE(vp, &tv, &tv, 1);
vput(vp);
if (error)
break;