diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2018-04-25 12:17:13 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2018-06-04 20:45:55 +0200 |
| commit | d2935d6f758fa72290ed30bd7482675e04715b6f (patch) | |
| tree | 633139f51d26b129a7586df7ecee7134737b6b56 /net | |
| parent | fe943d50425b6646606f8ef1ef8b8d4975fdbee2 (diff) | |
| download | linux-stable-d2935d6f758fa72290ed30bd7482675e04715b6f.tar.gz linux-stable-d2935d6f758fa72290ed30bd7482675e04715b6f.tar.bz2 linux-stable-d2935d6f758fa72290ed30bd7482675e04715b6f.zip | |
libceph: get rid of more_kvec in try_write()
All gotos to "more" are conditioned on con->state == OPEN, but the only
thing "more" does is opening the socket if con->state == PREOPEN. Kill
that label and rename "more_kvec" to "more".
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/messenger.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3b3d33ea9ed8..53d145637ed5 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2575,9 +2575,6 @@ static int try_write(struct ceph_connection *con) con->state != CON_STATE_OPEN) return 0; -more: - dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); - /* open the socket first? */ if (con->state == CON_STATE_PREOPEN) { BUG_ON(con->sock); @@ -2598,7 +2595,8 @@ more: } } -more_kvec: +more: + dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); BUG_ON(!con->sock); /* kvec data queued? */ @@ -2623,7 +2621,7 @@ more_kvec: ret = write_partial_message_data(con); if (ret == 1) - goto more_kvec; /* we need to send the footer, too! */ + goto more; /* we need to send the footer, too! */ if (ret == 0) goto out; if (ret < 0) { @@ -2659,8 +2657,6 @@ out: return ret; } - - /* * Read what we can from the socket. */ |