diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2018-08-16 16:13:03 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2018-08-16 16:21:29 -0400 |
| commit | 0a3173a5f09bc58a3638ecfd0a80bdbae55e123c (patch) | |
| tree | d6c0bc84863cca54dfbde3b7463e5d49c82af9f1 /net/sunrpc | |
| parent | 92f4e77c85918eab5e5803d7e28ab89a7e6bd3a2 (diff) | |
| parent | 5c60a7389d795e001c8748b458eb76e3a5b6008c (diff) | |
Merge branch 'linus/master' into rdma.git for-next
rdma.git merge resolution for the 4.19 merge window
Conflicts:
drivers/infiniband/core/rdma_core.c
- Use the rdma code and revise with the new spelling for
atomic_fetch_add_unless
drivers/nvme/host/rdma.c
- Replace max_sge with max_send_sge in new blk code
drivers/nvme/target/rdma.c
- Use the blk code and revise to use NULL for ib_post_recv when
appropriate
- Replace max_sge with max_recv_sge in new blk code
net/rds/ib_send.c
- Use the net code and revise to use NULL for ib_post_recv when
appropriate
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Diffstat (limited to 'net/sunrpc')
| -rw-r--r-- | net/sunrpc/auth_gss/auth_gss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index be8f103d22fd..0fc397fae42b 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
| @@ -517,7 +517,7 @@ gss_alloc_msg(struct gss_auth *gss_auth, | |||
| 517 | err = gss_encode_v1_msg(gss_msg, service_name, gss_auth->target_name); | 517 | err = gss_encode_v1_msg(gss_msg, service_name, gss_auth->target_name); |
| 518 | if (err) | 518 | if (err) |
| 519 | goto err_put_pipe_version; | 519 | goto err_put_pipe_version; |
| 520 | }; | 520 | } |
| 521 | kref_get(&gss_auth->kref); | 521 | kref_get(&gss_auth->kref); |
| 522 | return gss_msg; | 522 | return gss_msg; |
| 523 | err_put_pipe_version: | 523 | err_put_pipe_version: |