diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2016-01-15 13:20:01 +0100 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2016-01-21 19:36:09 +0100 |
| commit | f6cdb2928df87c2277ec691101e5843db6cb96ea (patch) | |
| tree | a7f3777a1a5cbcab35fcbcf3474ce9b32e881b5f | |
| parent | 187d131dd983fb1ab1c5d0d9ee98ab6511f252cd (diff) | |
| download | blackbird-obmc-linux-f6cdb2928df87c2277ec691101e5843db6cb96ea.tar.gz blackbird-obmc-linux-f6cdb2928df87c2277ec691101e5843db6cb96ea.zip | |
libceph: kill off ceph_x_ticket_handler::validity
With it gone, no need to preserve ceph_timespec in process_one_ticket()
either.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
| -rw-r--r-- | net/ceph/auth_x.c | 6 | ||||
| -rw-r--r-- | net/ceph/auth_x.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/ceph/auth_x.c b/net/ceph/auth_x.c index 05e9fc21d460..9e43a315e662 100644 --- a/net/ceph/auth_x.c +++ b/net/ceph/auth_x.c @@ -152,7 +152,6 @@ static int process_one_ticket(struct ceph_auth_client *ac, void *ticket_buf = NULL; void *tp, *tpend; void **ptp; - struct ceph_timespec new_validity; struct ceph_crypto_key new_session_key; struct ceph_buffer *new_ticket_blob; unsigned long new_expires, new_renew_after; @@ -193,8 +192,8 @@ static int process_one_ticket(struct ceph_auth_client *ac, if (ret) goto out; - ceph_decode_copy(&dp, &new_validity, sizeof(new_validity)); - ceph_decode_timespec(&validity, &new_validity); + ceph_decode_timespec(&validity, dp); + dp += sizeof(struct ceph_timespec); new_expires = get_seconds() + validity.tv_sec; new_renew_after = new_expires - (validity.tv_sec / 4); dout(" expires=%lu renew_after=%lu\n", new_expires, @@ -233,7 +232,6 @@ static int process_one_ticket(struct ceph_auth_client *ac, ceph_buffer_put(th->ticket_blob); th->session_key = new_session_key; th->ticket_blob = new_ticket_blob; - th->validity = new_validity; th->secret_id = new_secret_id; th->expires = new_expires; th->renew_after = new_renew_after; diff --git a/net/ceph/auth_x.h b/net/ceph/auth_x.h index 5334b9b159c5..40b1a3cf7397 100644 --- a/net/ceph/auth_x.h +++ b/net/ceph/auth_x.h @@ -16,7 +16,6 @@ struct ceph_x_ticket_handler { unsigned int service; struct ceph_crypto_key session_key; - struct ceph_timespec validity; bool have_key; u64 secret_id; |
