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
LU-4357 libcfs: restore __GFP_WAIT flag to memalloc calls
[fs/lustre-release.git]
/
lustre
/
include
/
obd_support.h
diff --git
a/lustre/include/obd_support.h
b/lustre/include/obd_support.h
index
a29a458
..
4d192ca
100644
(file)
--- a/
lustre/include/obd_support.h
+++ b/
lustre/include/obd_support.h
@@
-666,8
+666,8
@@
do { \
#define OBD_ALLOC_GFP(ptr, size, gfp_mask) \
__OBD_MALLOC_VERBOSE(ptr, NULL, 0, size, gfp_mask)
#define OBD_ALLOC_GFP(ptr, size, gfp_mask) \
__OBD_MALLOC_VERBOSE(ptr, NULL, 0, size, gfp_mask)
-#define OBD_ALLOC(ptr, size) OBD_ALLOC_GFP(ptr, size,
__GFP_IO
)
-#define OBD_ALLOC_WAIT(ptr, size) OBD_ALLOC_GFP(ptr, size, GFP_
IOFS
)
+#define OBD_ALLOC(ptr, size) OBD_ALLOC_GFP(ptr, size,
GFP_NOFS
)
+#define OBD_ALLOC_WAIT(ptr, size) OBD_ALLOC_GFP(ptr, size, GFP_
KERNEL
)
#define OBD_ALLOC_PTR(ptr) OBD_ALLOC(ptr, sizeof *(ptr))
#define OBD_ALLOC_PTR_WAIT(ptr) OBD_ALLOC_WAIT(ptr, sizeof *(ptr))
#define OBD_ALLOC_PTR(ptr) OBD_ALLOC(ptr, sizeof *(ptr))
#define OBD_ALLOC_PTR_WAIT(ptr) OBD_ALLOC_WAIT(ptr, sizeof *(ptr))
@@
-675,7
+675,7
@@
do { \
__OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, gfp_mask)
#define OBD_CPT_ALLOC(ptr, cptab, cpt, size) \
__OBD_MALLOC_VERBOSE(ptr, cptab, cpt, size, gfp_mask)
#define OBD_CPT_ALLOC(ptr, cptab, cpt, size) \
- OBD_CPT_ALLOC_GFP(ptr, cptab, cpt, size,
__GFP_IO
)
+ OBD_CPT_ALLOC_GFP(ptr, cptab, cpt, size,
GFP_NOFS
)
#define OBD_CPT_ALLOC_PTR(ptr, cptab, cpt) \
OBD_CPT_ALLOC(ptr, cptab, cpt, sizeof *(ptr))
#define OBD_CPT_ALLOC_PTR(ptr, cptab, cpt) \
OBD_CPT_ALLOC(ptr, cptab, cpt, sizeof *(ptr))
@@
-834,10
+834,10
@@
do { \
} while(0)
#define OBD_SLAB_ALLOC(ptr, slab, size) \
} while(0)
#define OBD_SLAB_ALLOC(ptr, slab, size) \
- OBD_SLAB_ALLOC_GFP(ptr, slab, size,
__GFP_IO
)
+ OBD_SLAB_ALLOC_GFP(ptr, slab, size,
GFP_NOFS
)
#define OBD_SLAB_CPT_ALLOC(ptr, slab, cptab, cpt, size) \
#define OBD_SLAB_CPT_ALLOC(ptr, slab, cptab, cpt, size) \
- OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size,
__GFP_IO
)
+ OBD_SLAB_CPT_ALLOC_GFP(ptr, slab, cptab, cpt, size,
GFP_NOFS
)
#define OBD_SLAB_ALLOC_PTR(ptr, slab) \
OBD_SLAB_ALLOC(ptr, slab, sizeof *(ptr))
#define OBD_SLAB_ALLOC_PTR(ptr, slab) \
OBD_SLAB_ALLOC(ptr, slab, sizeof *(ptr))