Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb1b8af3 authored by Yan, Zheng's avatar Yan, Zheng Committed by Sage Weil
Browse files

ceph: cleanup aborted requests when re-sending requests. 



Aborted requests usually get cleared when the reply is received.
If MDS crashes, no reply will be received. So we need to cleanup
aborted requests when re-sending requests.

Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: default avatarGreg Farnum <greg@inktank.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 99a9c273

fs/ceph/mds_client.c

+4 −1
Original line number Diff line number Diff line
@@ -1872,8 +1872,11 @@ static int __do_request(struct ceph_mds_client *mdsc, 
	int mds = -1;

	int err = -EAGAIN;



	if (req->r_err || req->r_got_result)

	if (req->r_err || req->r_got_result) {

		if (req->r_aborted)

			__unregister_request(mdsc, req);

		goto out;

	}



	if (req->r_timeout &&

	    time_after_eq(jiffies, req->r_started + req->r_timeout)) {