diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-21 09:43:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-21 09:43:37 -0800 |
| commit | 8a61716ff2ab23eddd1f7a05a075a374e4d0c3d4 (patch) | |
| tree | f9534a62abcc72668a934948206bc1446afc44a8 | |
| parent | d6622d913a637bce224f74425a9dfe734f946358 (diff) | |
| parent | 04242ff3ac0abbaa4362f97781dac268e6c3541a (diff) | |
| download | linux-soc-thermal-8a61716ff2ab23eddd1f7a05a075a374e4d0c3d4.tar.gz | |
Merge tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Two bug fixes for old issues, both marked for stable"
* tag 'ceph-for-5.0-rc8' of git://github.com/ceph/ceph-client:
ceph: avoid repeatedly adding inode to mdsc->snap_flush_list
libceph: handle an empty authorize reply
| -rw-r--r-- | fs/ceph/snap.c | 3 | ||||
| -rw-r--r-- | net/ceph/messenger.c | 15 |
2 files changed, 11 insertions, 7 deletions
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 041c27ea8de155..f74193da0e092b 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c @@ -616,7 +616,8 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci, capsnap->size); spin_lock(&mdsc->snap_flush_lock); - list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); + if (list_empty(&ci->i_snap_flush_item)) + list_add_tail(&ci->i_snap_flush_item, &mdsc->snap_flush_list); spin_unlock(&mdsc->snap_flush_lock); return 1; /* caller may want to ceph_flush_snaps */ } diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index 3661cdd927f15f..7e71b0df1fbc91 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -2058,6 +2058,8 @@ static int process_connect(struct ceph_connection *con) dout("process_connect on %p tag %d\n", con, (int)con->in_tag); if (con->auth) { + int len = le32_to_cpu(con->in_reply.authorizer_len); + /* * Any connection that defines ->get_authorizer() * should also define ->add_authorizer_challenge() and @@ -2067,8 +2069,7 @@ static int process_connect(struct ceph_connection *con) */ if (con->in_reply.tag == CEPH_MSGR_TAG_CHALLENGE_AUTHORIZER) { ret = con->ops->add_authorizer_challenge( - con, con->auth->authorizer_reply_buf, - le32_to_cpu(con->in_reply.authorizer_len)); + con, con->auth->authorizer_reply_buf, len); if (ret < 0) return ret; @@ -2078,10 +2079,12 @@ static int process_connect(struct ceph_connection *con) return 0; } - ret = con->ops->verify_authorizer_reply(con); - if (ret < 0) { - con->error_msg = "bad authorize reply"; - return ret; + if (len) { + ret = con->ops->verify_authorizer_reply(con); + if (ret < 0) { + con->error_msg = "bad authorize reply"; + return ret; + } } } |