lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jan 2014 14:23:44 +0000 From: Luis Henriques <luis.henriques@...onical.com> To: linux-kernel@...r.kernel.org, stable@...r.kernel.org, kernel-team@...ts.ubuntu.com Cc: "Yan, Zheng" <zheng.z.yan@...el.com>, Sage Weil <sage@...tank.com>, Luis Henriques <luis.henriques@...onical.com> Subject: [PATCH 3.5 21/96] ceph: cleanup aborted requests when re-sending requests. 3.5.7.29 -stable review patch. If anyone has any objections, please let me know. ------------------ From: "Yan, Zheng" <zheng.z.yan@...el.com> commit eb1b8af33c2e42a9a57fc0a7588f4a7b255d2e79 upstream. 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: Yan, Zheng <zheng.z.yan@...el.com> Reviewed-by: Greg Farnum <greg@...tank.com> Signed-off-by: Sage Weil <sage@...tank.com> Signed-off-by: Luis Henriques <luis.henriques@...onical.com> --- fs/ceph/mds_client.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 0b26ea8..5efe309 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -1815,8 +1815,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)) { -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists