Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
. fixed assertion when called from interrupt handler (allocating lib_msg_t)
[fs/lustre-release.git]
/
lustre
/
portals
/
include
/
linux
/
kp30.h
diff --git
a/lustre/portals/include/linux/kp30.h
b/lustre/portals/include/linux/kp30.h
index
815375c
..
63eaee7
100644
(file)
--- a/
lustre/portals/include/linux/kp30.h
+++ b/
lustre/portals/include/linux/kp30.h
@@
-282,7
+282,9
@@
do { \
#define PORTAL_ALLOC_GFP(ptr, size, mask) \
do { \
- LASSERT (!in_interrupt()); \
+ LASSERT (!in_interrupt() || \
+ (size <= PORTAL_VMALLOC_SIZE && \
+ (mask & __GFP_WAIT) == 0)); \
if ((size) > PORTAL_VMALLOC_SIZE) \
(ptr) = vmalloc(size); \
else \