- fix up eeb's assertion fix. __GFP_WAIT isn't sufficient, it's GFP_ATOMIC that

  callers use.

diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index 63eaee7..12d9f56 100644 (file)
--- a/lnet/include/linux/kp30.h
+++ b/lnet/include/linux/kp30.h
@@ -282,9 +282,8 @@ do {                                                                          \
 
 #define PORTAL_ALLOC_GFP(ptr, size, mask)                                 \
 do {                                                                      \
-        LASSERT (!in_interrupt() ||                                       \
-                 (size <= PORTAL_VMALLOC_SIZE &&                          \
-                  (mask & __GFP_WAIT) == 0));                             \
+        LASSERT(!in_interrupt() ||                                        \
+               (size <= PORTAL_VMALLOC_SIZE && mask == GFP_ATOMIC));      \
         if ((size) > PORTAL_VMALLOC_SIZE)                                 \
                 (ptr) = vmalloc(size);                                    \
         else                                                              \

diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h
index 63eaee7..12d9f56 100644 (file)
--- a/lustre/portals/include/linux/kp30.h
+++ b/lustre/portals/include/linux/kp30.h
@@ -282,9 +282,8 @@ do {                                                                          \
 
 #define PORTAL_ALLOC_GFP(ptr, size, mask)                                 \
 do {                                                                      \
-        LASSERT (!in_interrupt() ||                                       \
-                 (size <= PORTAL_VMALLOC_SIZE &&                          \
-                  (mask & __GFP_WAIT) == 0));                             \
+        LASSERT(!in_interrupt() ||                                        \
+               (size <= PORTAL_VMALLOC_SIZE && mask == GFP_ATOMIC));      \
         if ((size) > PORTAL_VMALLOC_SIZE)                                 \
                 (ptr) = vmalloc(size);                                    \
         else                                                              \