diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-03-21 16:44:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-22 19:29:58 -0400 |
commit | f0229eaaf3f82522e2b16b41b0f45bb84a88d1b0 (patch) | |
tree | dfe2f90e6aeb6d4a4406300f48c24e11b2ee8995 /net | |
parent | 64b5fad526f63e9b56752a7e8e153b99ec0ddecd (diff) |
RDS: use gfp flags from caller in conn_alloc()
We should be using the gfp flags the caller specified here, instead of
GFP_KERNEL. I think this might be a bugfix, depending on the value of
"sock->sk->sk_allocation" when we call rds_conn_create_outgoing() in
rds_sendmsg(). Otherwise, it's just a cleanup.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/rds/ib_cm.c | 2 | ||||
-rw-r--r-- | net/rds/iw_cm.c | 2 | ||||
-rw-r--r-- | net/rds/loop.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index 51c868923f64..a1e116277477 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c | |||
@@ -749,7 +749,7 @@ int rds_ib_conn_alloc(struct rds_connection *conn, gfp_t gfp) | |||
749 | int ret; | 749 | int ret; |
750 | 750 | ||
751 | /* XXX too lazy? */ | 751 | /* XXX too lazy? */ |
752 | ic = kzalloc(sizeof(struct rds_ib_connection), GFP_KERNEL); | 752 | ic = kzalloc(sizeof(struct rds_ib_connection), gfp); |
753 | if (!ic) | 753 | if (!ic) |
754 | return -ENOMEM; | 754 | return -ENOMEM; |
755 | 755 | ||
diff --git a/net/rds/iw_cm.c b/net/rds/iw_cm.c index 9556d2895f7a..a91e1db62ee6 100644 --- a/net/rds/iw_cm.c +++ b/net/rds/iw_cm.c | |||
@@ -694,7 +694,7 @@ int rds_iw_conn_alloc(struct rds_connection *conn, gfp_t gfp) | |||
694 | unsigned long flags; | 694 | unsigned long flags; |
695 | 695 | ||
696 | /* XXX too lazy? */ | 696 | /* XXX too lazy? */ |
697 | ic = kzalloc(sizeof(struct rds_iw_connection), GFP_KERNEL); | 697 | ic = kzalloc(sizeof(struct rds_iw_connection), gfp); |
698 | if (!ic) | 698 | if (!ic) |
699 | return -ENOMEM; | 699 | return -ENOMEM; |
700 | 700 | ||
diff --git a/net/rds/loop.c b/net/rds/loop.c index 87ff2a8a454b..6b12b68541ae 100644 --- a/net/rds/loop.c +++ b/net/rds/loop.c | |||
@@ -121,7 +121,7 @@ static int rds_loop_conn_alloc(struct rds_connection *conn, gfp_t gfp) | |||
121 | struct rds_loop_connection *lc; | 121 | struct rds_loop_connection *lc; |
122 | unsigned long flags; | 122 | unsigned long flags; |
123 | 123 | ||
124 | lc = kzalloc(sizeof(struct rds_loop_connection), GFP_KERNEL); | 124 | lc = kzalloc(sizeof(struct rds_loop_connection), gfp); |
125 | if (!lc) | 125 | if (!lc) |
126 | return -ENOMEM; | 126 | return -ENOMEM; |
127 | 127 | ||