diff options
| author | Ilya Dryomov <idryomov@gmail.com> | 2020-06-10 14:41:30 +0200 |
|---|---|---|
| committer | Ilya Dryomov <idryomov@gmail.com> | 2020-08-03 11:03:01 +0200 |
| commit | 5133ba8f15911e98567cdb6b767be8080a636b0b (patch) | |
| tree | aac62c0ed7a3605bca9f255ed25603dbfe914951 /net/ceph | |
| parent | bcf876870b95592b52519ed4aafcf9d95999bc9c (diff) | |
| download | linux-stable-5133ba8f15911e98567cdb6b767be8080a636b0b.tar.gz linux-stable-5133ba8f15911e98567cdb6b767be8080a636b0b.tar.bz2 linux-stable-5133ba8f15911e98567cdb6b767be8080a636b0b.zip | |
libceph: use target_copy() in send_linger()
Instead of copying just oloc, oid and flags, copy the entire
linger target. This is more for consistency than anything else,
as send_linger() -> submit_request() -> __submit_request() sends
the request regardless of what calc_target() says (i.e. both on
CALC_TARGET_NO_ACTION and CALC_TARGET_NEED_RESEND).
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/osd_client.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c index 2db8b44e70c2..db6abb5a5511 100644 --- a/net/ceph/osd_client.c +++ b/net/ceph/osd_client.c @@ -3076,9 +3076,7 @@ static void send_linger(struct ceph_osd_linger_request *lreq) cancel_linger_request(req); request_reinit(req); - ceph_oid_copy(&req->r_base_oid, &lreq->t.base_oid); - ceph_oloc_copy(&req->r_base_oloc, &lreq->t.base_oloc); - req->r_flags = lreq->t.flags; + target_copy(&req->r_t, &lreq->t); req->r_mtime = lreq->mtime; mutex_lock(&lreq->lock); |