lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[XFS] pv 956240, author: nathans, rv: vapo - Minor fixes in

Browse Source 
kmem_zalloc_greedy()

SGI-PV: 956240
SGI-Modid: xfs-linux-melb:xfs-kern:26983a

Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Vlad Apostolov
2006-09-28 11:06:10 +10:00
committed by Tim Shimmin
parent f273ab848b
commit 6216ff1883
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
fs/xfs/linux-2.6/kmem.c
View File

@@ -73,14 +73,19 @@ kmem_zalloc_greedy(size_t *size, size_t minsize, size_t maxsize,
unsigned int __nocast flags) unsigned int __nocast flags)
{ {
void *ptr; void *ptr;
size_t kmsize = maxsize;
unsigned int kmflags = (flags & ~KM_SLEEP) | KM_NOSLEEP;
while (!(ptr = kmem_zalloc(maxsize, flags))) { while (!(ptr = kmem_zalloc(kmsize, kmflags))) {
if ((maxsize >>= 1) <= minsize) { if ((kmsize <= minsize) && (flags & KM_NOSLEEP))
maxsize = minsize; break;
flags = KM_SLEEP; if ((kmsize >>= 1) <= minsize) {
kmsize = minsize;
kmflags = flags;
} }
} }
*size = maxsize; if (ptr)
*size = kmsize;
return ptr; return ptr;
} }