projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[cascardo/linux.git]
/
net
/
rds
/
ib_recv.c
diff --git
a/net/rds/ib_recv.c
b/net/rds/ib_recv.c
index
96744b7
..
977fb86
100644
(file)
--- a/
net/rds/ib_recv.c
+++ b/
net/rds/ib_recv.c
@@
-305,7
+305,7
@@
static int rds_ib_recv_refill_one(struct rds_connection *conn,
gfp_t slab_mask = GFP_NOWAIT;
gfp_t page_mask = GFP_NOWAIT;
gfp_t slab_mask = GFP_NOWAIT;
gfp_t page_mask = GFP_NOWAIT;
- if (gfp & __GFP_
WAIT
) {
+ if (gfp & __GFP_
DIRECT_RECLAIM
) {
slab_mask = GFP_KERNEL;
page_mask = GFP_HIGHUSER;
}
slab_mask = GFP_KERNEL;
page_mask = GFP_HIGHUSER;
}
@@
-379,7
+379,7
@@
void rds_ib_recv_refill(struct rds_connection *conn, int prefill, gfp_t gfp)
struct ib_recv_wr *failed_wr;
unsigned int posted = 0;
int ret = 0;
struct ib_recv_wr *failed_wr;
unsigned int posted = 0;
int ret = 0;
- bool can_wait = !!(gfp & __GFP_
WAIT
);
+ bool can_wait = !!(gfp & __GFP_
DIRECT_RECLAIM
);
u32 pos;
/* the goal here is to just make sure that someone, somewhere
u32 pos;
/* the goal here is to just make sure that someone, somewhere