From: Liang Zhen Date: Sat, 1 Mar 2014 02:16:40 +0000 (-0500) Subject: lustre/ptlrpc: rq_commit_cb is called for twice X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=503a1ac74aa4e5b63d2a283b82f26684ce812b64;p=openwrt%2Fstaging%2Fblogic.git lustre/ptlrpc: rq_commit_cb is called for twice If a ptlrpc_request is already on imp::imp_replay_list, when it's replayed and replied, after_reply() will call req::rq_commit_cb for the request, then call it again in ptlrpc_free_committed. Signed-off-by: Liang Zhen Reviewed-on: http://review.whamcloud.com/8815 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3618 Reviewed-by: Alex Zhuravlev Reviewed-by: Bobi Jam Reviewed-by: Oleg Drokin Signed-off-by: Oleg Drokin Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/lustre/lustre/ptlrpc/client.c b/drivers/staging/lustre/lustre/ptlrpc/client.c index e1e121b785b9..4c9e00695087 100644 --- a/drivers/staging/lustre/lustre/ptlrpc/client.c +++ b/drivers/staging/lustre/lustre/ptlrpc/client.c @@ -1316,7 +1316,11 @@ static int after_reply(struct ptlrpc_request *req) /** version recovery */ ptlrpc_save_versions(req); ptlrpc_retain_replayable_request(req, imp); - } else if (req->rq_commit_cb != NULL) { + } else if (req->rq_commit_cb != NULL && + list_empty(&req->rq_replay_list)) { + /* NB: don't call rq_commit_cb if it's already on + * rq_replay_list, ptlrpc_free_committed() will call + * it later, see LU-3618 for details */ spin_unlock(&imp->imp_lock); req->rq_commit_cb(req); spin_lock(&imp->imp_lock);