From ca9d5995c11b8ab607780fc24ff1541f39f2834a Mon Sep 17 00:00:00 2001
From: zab <zab>
Date: Thu, 8 Jan 2004 06:37:29 +0000
Subject: [PATCH] - fix up eeb's assertion fix. __GFP_WAIT isn't sufficient,
it's GFP_ATOMIC that callers use.
---
lnet/include/linux/kp30.h | 5 ++---
lustre/portals/include/linux/kp30.h | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index 63eaee7629..12d9f56d3b 100644
--- 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 63eaee7629..12d9f56d3b 100644
--- 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 \
--
GitLab