From patchwork Fri Mar 20 07:56:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6054711 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1C921BF90F for ; Fri, 20 Mar 2015 07:56:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C0E9204EB for ; Fri, 20 Mar 2015 07:56:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 55199204E3 for ; Fri, 20 Mar 2015 07:56:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751250AbbCTH4z (ORCPT ); Fri, 20 Mar 2015 03:56:55 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:33539 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751203AbbCTH4y (ORCPT ); Fri, 20 Mar 2015 03:56:54 -0400 Received: by pabxg6 with SMTP id xg6so88666352pab.0 for ; Fri, 20 Mar 2015 00:56:54 -0700 (PDT) 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== X-Received: by 10.66.241.71 with SMTP id wg7mr182391125pac.81.1426838214118; Fri, 20 Mar 2015 00:56:54 -0700 (PDT) Received: from [192.168.99.8] ([104.143.41.79]) by mx.google.com with ESMTPSA id c16sm6557008pdk.94.2015.03.20.00.56.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Mar 2015 00:56:53 -0700 (PDT) Message-ID: <550BD2B8.6070900@gmail.com> Date: Fri, 20 Mar 2015 15:56:40 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Christoph Hellwig , "J. Bruce Fields" CC: Dave Chinner , Eric Sandeen , Linux NFS Mailing List , xfs@oss.sgi.com Subject: [PATCH] NFSD: Fix infinite loop in nfsd4_cb_layout_fail() References: <20150304020826.GD19439@fieldses.org> <20150304155421.GE1627@fieldses.org> <20150304220900.GX18360@dastard> <20150304222709.GI1627@fieldses.org> <20150304224557.GY4251@dastard> <54F78BE5.1020608@sandeen.net> <20150304225623.GZ4251@dastard> <20150305040849.GJ1627@fieldses.org> <20150305131731.GA16235@lst.de> <20150320065010.GC626@lst.de> In-Reply-To: <20150320065010.GC626@lst.de> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix commit 31ef83dc05 (nfsd: add trace events)'s typo causing a infinite loop when callback layout fail. Signed-off-by: Christoph Hellwig Signed-off-by: Kinglong Mee --- 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. "