diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-27 19:56:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-27 19:56:29 +0200 |
| commit | 64ebe3126cefa45d7b97a6fc4de846285a55321f (patch) | |
| tree | d5da52890ad750e10aec7ddc6cfc1fb7f7c1381d /net/ceph/messenger.c | |
| parent | Merge tag 'char-misc-4.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | libceph: validate con->state at the top of try_write() (diff) | |
| download | linux-64ebe3126cefa45d7b97a6fc4de846285a55321f.tar.xz linux-64ebe3126cefa45d7b97a6fc4de846285a55321f.zip | |
Merge tag 'ceph-for-4.17-rc3' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"A CephFS quota follow-up and fixes for two older issues in the
messenger layer, marked for stable"
* tag 'ceph-for-4.17-rc3' of git://github.com/ceph/ceph-client:
libceph: validate con->state at the top of try_write()
libceph: reschedule a tick in finish_hunting()
libceph: un-backoff on tick when we have a authenticated session
ceph: check if mds create snaprealm when setting quota
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index fcb40c12b1f8..3b3d33ea9ed8 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2569,6 +2569,11 @@ static int try_write(struct ceph_connection *con) int ret = 1; dout("try_write start %p state %lu\n", con, con->state); + if (con->state != CON_STATE_PREOPEN && + con->state != CON_STATE_CONNECTING && + con->state != CON_STATE_NEGOTIATING && + con->state != CON_STATE_OPEN) + return 0; more: dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); @@ -2594,6 +2599,8 @@ more: } more_kvec: + BUG_ON(!con->sock); + /* kvec data queued? */ if (con->out_kvec_left) { ret = write_partial_kvec(con); |