git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
ftape
/
zftape
/
zftape-buffers.c
diff --git
a/drivers/char/ftape/zftape/zftape-buffers.c
b/drivers/char/ftape/zftape/zftape-buffers.c
index
3d64839
..
da06f13
100644
(file)
--- a/
drivers/char/ftape/zftape/zftape-buffers.c
+++ b/
drivers/char/ftape/zftape/zftape-buffers.c
@@
-27,6
+27,7
@@
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/mm.h>
#include <linux/slab.h>
+#include <linux/delay.h>
#include <linux/zftape.h>
#include <linux/zftape.h>
@@
-86,13
+87,6
@@
int zft_vmalloc_once(void *new, size_t size)
TRACE_ABORT(0, ft_t_noise,
"allocated buffer @ %p, %d bytes", *(void **)new, size);
}
TRACE_ABORT(0, ft_t_noise,
"allocated buffer @ %p, %d bytes", *(void **)new, size);
}
-int zft_vcalloc_always(void *new, size_t size)
-{
- TRACE_FUN(ft_t_flow);
-
- zft_vfree(new, size);
- TRACE_EXIT zft_vcalloc_once(new, size);
-}
int zft_vmalloc_always(void *new, size_t size)
{
TRACE_FUN(ft_t_flow);
int zft_vmalloc_always(void *new, size_t size)
{
TRACE_FUN(ft_t_flow);
@@
-119,8
+113,7
@@
void *zft_kmalloc(size_t size)
void *new;
while ((new = kmalloc(size, GFP_KERNEL)) == NULL) {
void *new;
while ((new = kmalloc(size, GFP_KERNEL)) == NULL) {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ/10);
+ msleep_interruptible(100);
}
memset(new, 0, size);
used_memory += size;
}
memset(new, 0, size);
used_memory += size;