diff options
| author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
| commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
| tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/fs/fdescfs | |
| parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
| download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz | |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
Diffstat (limited to 'sys/fs/fdescfs')
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/fs/fdescfs/fdesc_vnops.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/fdescfs/fdesc_vfsops.c b/sys/fs/fdescfs/fdesc_vfsops.c index a4741bc..18bff45 100644 --- a/sys/fs/fdescfs/fdesc_vfsops.c +++ b/sys/fs/fdescfs/fdesc_vfsops.c @@ -89,7 +89,7 @@ fdesc_mount(mp, ndp, td) return (error); MALLOC(fmp, struct fdescmount *, sizeof(struct fdescmount), - M_FDESCMNT, M_WAITOK); /* XXX */ + M_FDESCMNT, 0); /* XXX */ rvp->v_type = VDIR; rvp->v_vflag |= VV_ROOT; fmp->f_root = rvp; diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 2225220..467066b 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -132,7 +132,7 @@ loop: * might cause a bogus v_data pointer to get dereferenced * elsewhere if MALLOC should block. */ - MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, M_WAITOK); + MALLOC(fd, struct fdescnode *, sizeof(struct fdescnode), M_TEMP, 0); error = getnewvnode("fdesc", mp, fdesc_vnodeop_p, vpp); if (error) { |
