diff options
| author |   cheloha <cheloha@openbsd.org> | 2019-07-19 00:24:31 +0000 |
|---|---|---|
| committer | cheloha <cheloha@openbsd.org> | 2019-07-19 00:24:31 +0000 |
| commit | 570df5c46ec138c3c01140bbdb153f33c5d6314c (patch) | |
| tree | 662107fcfc8e33d6b8a13855f7da2fe70dab336e /sys/msdosfs | |
| parent | ttysleep(): drop unused timeout parameter (diff) | |
| download | wireguard-openbsd-570df5c46ec138c3c01140bbdb153f33c5d6314c.tar.xz wireguard-openbsd-570df5c46ec138c3c01140bbdb153f33c5d6314c.zip | |
getblk(9): tsleep(9) -> tsleep_nsec(9); ok visa@
Diffstat (limited to 'sys/msdosfs')
| -rw-r--r-- | sys/msdosfs/msdosfs_fat.c | 9 | ||||
| -rw-r--r-- | sys/msdosfs/msdosfs_vnops.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/msdosfs/msdosfs_fat.c b/sys/msdosfs/msdosfs_fat.c index 0bddf99534b..64183914e66 100644 --- a/sys/msdosfs/msdosfs_fat.c +++ b/sys/msdosfs/msdosfs_fat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_fat.c,v 1.32 2018/05/07 14:43:01 mpi Exp $ */ +/* $OpenBSD: msdosfs_fat.c,v 1.33 2019/07/19 00:24:31 cheloha Exp $ */ /* $NetBSD: msdosfs_fat.c,v 1.26 1997/10/17 11:24:02 ws Exp $ */ /*- @@ -365,7 +365,8 @@ updatefats(struct msdosfsmount *pmp, struct buf *bp, uint32_t fatbn) for (i = 1; i < pmp->pm_FATs; i++) { fatbn += pmp->pm_FATsecs; /* getblk() never fails */ - bpn = getblk(pmp->pm_devvp, fatbn, bp->b_bcount, 0, 0); + bpn = getblk(pmp->pm_devvp, fatbn, bp->b_bcount, 0, + INFSLP); bcopy(bp->b_data, bpn->b_data, bp->b_bcount); if (pmp->pm_flags & MSDOSFSMNT_WAITONFAT) bwrite(bpn); @@ -1018,10 +1019,10 @@ extendfile(struct denode *dep, uint32_t count, struct buf **bpp, uint32_t *ncp, */ if (dep->de_Attributes & ATTR_DIRECTORY) bp = getblk(pmp->pm_devvp, cntobn(pmp, cn++), - pmp->pm_bpcluster, 0, 0); + pmp->pm_bpcluster, 0, INFSLP); else { bp = getblk(DETOV(dep), frcn++, - pmp->pm_bpcluster, 0, 0); + pmp->pm_bpcluster, 0, INFSLP); /* * Do the bmap now, as in msdosfs_write */ diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c index dcf77c86a21..9da3f95f632 100644 --- a/sys/msdosfs/msdosfs_vnops.c +++ b/sys/msdosfs/msdosfs_vnops.c @@ -1,4 +1,4 @@ -/* $OpenBSD: msdosfs_vnops.c,v 1.124 2019/07/12 13:56:27 solene Exp $ */ +/* $OpenBSD: msdosfs_vnops.c,v 1.125 2019/07/19 00:24:31 cheloha Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $ */ /*- @@ -680,7 +680,7 @@ msdosfs_write(void *v) * or we write the cluster from its start beyond EOF, * then no need to read data from disk. */ - bp = getblk(thisvp, cn, pmp->pm_bpcluster, 0, 0); + bp = getblk(thisvp, cn, pmp->pm_bpcluster, 0, INFSLP); clrbuf(bp); /* * Do the bmap now, since pcbmap needs buffers @@ -1307,7 +1307,7 @@ msdosfs_mkdir(void *v) */ bn = cntobn(pmp, newcluster); /* always succeeds */ - bp = getblk(pmp->pm_devvp, bn, pmp->pm_bpcluster, 0, 0); + bp = getblk(pmp->pm_devvp, bn, pmp->pm_bpcluster, 0, INFSLP); bzero(bp->b_data, pmp->pm_bpcluster); bcopy(&dosdirtemplate, bp->b_data, sizeof dosdirtemplate); denp = (struct direntry *)bp->b_data; |