diff options
| author | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | a163d034fadcfb4a25ca34a2ba5f491c47b6ff69 (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/kern/kern_lockf.c | |
| parent | 8f3e32c2b6b9f392e096f096653596f55f2134ae (diff) | |
| download | src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.tar.gz src-a163d034fadcfb4a25ca34a2ba5f491c47b6ff69.zip | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Notes
Notes:
svn path=/head/; revision=111119
Diffstat (limited to 'sys/kern/kern_lockf.c')
| -rw-r--r-- | sys/kern/kern_lockf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index b5d420453f4d..cb1fad413389 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -160,7 +160,7 @@ lf_advlock(ap, head, size) /* * Create the lockf structure */ - MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, 0); + MALLOC(lock, struct lockf *, sizeof *lock, M_LOCKF, M_WAITOK); lock->lf_start = start; lock->lf_end = end; lock->lf_id = ap->a_id; @@ -726,7 +726,7 @@ lf_split(lock1, lock2) * Make a new lock consisting of the last part of * the encompassing lock */ - MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, 0); + MALLOC(splitlock, struct lockf *, sizeof *splitlock, M_LOCKF, M_WAITOK); bcopy(lock1, splitlock, sizeof *splitlock); splitlock->lf_start = lock2->lf_end + 1; TAILQ_INIT(&splitlock->lf_blkhd); |