diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-20 02:46:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-20 02:46:11 +0300 |
| commit | f5c0c6f4299f870f074235fbf552ecf957fc249c (patch) | |
| tree | 6b46b9c0b271185b6f98fab350c3891042e729b1 /net/rds | |
| parent | 26736a08ee0fb89a4f09bfb2c9f0805028ff63aa (diff) | |
| parent | 79c0ef3e85c015b0921a8fd5dd539d1480e9cd6c (diff) | |
| download | linux-f5c0c6f4299f870f074235fbf552ecf957fc249c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/rds')
| -rw-r--r-- | net/rds/connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/connection.c b/net/rds/connection.c index 94e190febfdd..2da3176bf792 100644 --- a/net/rds/connection.c +++ b/net/rds/connection.c @@ -224,7 +224,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, if (rds_destroy_pending(conn)) ret = -ENETDOWN; else - ret = trans->conn_alloc(conn, gfp); + ret = trans->conn_alloc(conn, GFP_ATOMIC); if (ret) { rcu_read_unlock(); kfree(conn->c_path); |