xfs
[Top] [All Lists]

[PATCH] NFSD: Fix infinite loop in nfsd4_cb_layout_fail()

To: Christoph Hellwig <hch@xxxxxx>, "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Subject: [PATCH] NFSD: Fix infinite loop in nfsd4_cb_layout_fail()
From: Kinglong Mee <kinglongmee@xxxxxxxxx>
Date: Fri, 20 Mar 2015 15:56:40 +0800
Cc: Dave Chinner <david@xxxxxxxxxxxxx>, Eric Sandeen <sandeen@xxxxxxxxxxx>, Linux NFS Mailing List <linux-nfs@xxxxxxxxxxxxxxx>, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=eVcUZ6rqmVSuHsIlo+MJpztJ7TpUWXop5X6tTi91T9w=; b=VnKIV6dHXHZKwt+ZJHKvbrmUvEvUeps48SaFgK3IbPSOBbZmxJ+JVKJfAgS+RpZbNe BtU1jOxwdupgjsp67CkFhp9yk3bDSZoAQ6jLxP3iZkbV3Qn1BbojGkLMugRX35sq43K+ +zJbFiAY6MT+JPFFJXur/0BpUFcfsSMsGoZnuRyVSIYvc5Q9AKqG9oYqqDsH/ieO1xyc 9ZnlM4IYKoUgfaXY7HgM0xKEOGPJuNpr+PJfBQM1cdGfptKau8Et450HC27jCcDr+siL PxrEYlBvHVc6YHeLPbmXHQpXm2ES+4I4RR7pojzbTRDMNC00OTMXM0RPNiQVLJr9xt8U 9KYg==
In-reply-to: <20150320065010.GC626@xxxxxx>
References: <20150304020826.GD19439@xxxxxxxxxxxx> <20150304155421.GE1627@xxxxxxxxxxxx> <20150304220900.GX18360@dastard> <20150304222709.GI1627@xxxxxxxxxxxx> <20150304224557.GY4251@dastard> <54F78BE5.1020608@xxxxxxxxxxx> <20150304225623.GZ4251@dastard> <20150305040849.GJ1627@xxxxxxxxxxxx> <20150305131731.GA16235@xxxxxx> <CAB6yy341fvF8Bsg0_hViQm+zRLVdJ2WOE9duDwdU+S0CkOEpbg@xxxxxxxxxxxxxx> <20150320065010.GC626@xxxxxx>
User-agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0
Fix commit 31ef83dc05 (nfsd: add trace events)'s typo 
causing a infinite loop when callback layout fail.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Kinglong Mee <kinglongmee@xxxxxxxxx>
---
 fs/nfsd/nfs4layouts.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c
index 3c1bfa1..0a616b5 100644
--- a/fs/nfsd/nfs4layouts.c
+++ b/fs/nfsd/nfs4layouts.c
@@ -587,7 +587,7 @@ nfsd4_cb_layout_fail(struct nfs4_layout_stateid *ls)
 
        rpc_ntop((struct sockaddr *)&clp->cl_addr, addr_str, sizeof(addr_str));
 
-       nfsd4_cb_layout_fail(ls);
+       trace_layout_recall_fail(&ls->ls_stid.sc_stateid);
 
        printk(KERN_WARNING
                "nfsd: client %s failed to respond to layout recall. "
-- 
2.3.3

<Prev in Thread] Current Thread [Next in Thread>