From patchwork Mon Jul 13 09:29:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kinglong Mee X-Patchwork-Id: 6776771 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 46C4DC05AC for ; Mon, 13 Jul 2015 09:29:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 740EF20553 for ; Mon, 13 Jul 2015 09:29:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5C18C20557 for ; Mon, 13 Jul 2015 09:29:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751552AbbGMJ3L (ORCPT ); Mon, 13 Jul 2015 05:29:11 -0400 Received: from mail-pa0-f41.google.com ([209.85.220.41]:34582 "EHLO mail-pa0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbbGMJ3H (ORCPT ); Mon, 13 Jul 2015 05:29:07 -0400 Received: by pacan13 with SMTP id an13so13021366pac.1 for ; Mon, 13 Jul 2015 02:29:07 -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:subject:references :in-reply-to:content-type:content-transfer-encoding; bh=if/BTim1hmew2wQ6fyz/Aq4QaX1/MrYhzSoQvAGx9w0=; b=MJLYM3REEUQhs4av7fUd0rAqghiIiFGBkiqxDsrOvIGsOlvEaLyc7U/+fWy8Tsewgf IYGyQzRDXPX/dasgNzf9HyEwNnNuDjIBB9fBTj715We2pCaZx90mnmhwMdwGxYqXAq68 Hvs8TiCHS7n2OfE9N8whEmq+NAogjw0u6EfjOqAbSCWomgGfIaoJivK2PmxMTY6nBRI2 ti6yKZGSd01ZonofCZhcbISRq2LFIXTXD9gji6PLOZGcj7M9oRkr9oJkFcxKA1n9xfXI FTqTCFmEqBohlptl25wxyydi8zhnzqaUVRK/6SyGry6qzIV2i6DrBVAlrBZYOo9lThfq dOEA== X-Received: by 10.68.200.69 with SMTP id jq5mr67412252pbc.111.1436779747410; Mon, 13 Jul 2015 02:29:07 -0700 (PDT) Received: from [192.168.99.19] ([104.143.41.79]) by smtp.googlemail.com with ESMTPSA id q5sm18140789pdd.90.2015.07.13.02.29.03 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jul 2015 02:29:06 -0700 (PDT) Message-ID: <55A384DD.1000800@gmail.com> Date: Mon, 13 Jul 2015 17:29:01 +0800 From: Kinglong Mee User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: "J. Bruce Fields" , "linux-nfs@vger.kernel.org" , kinglongmee@gmail.com Subject: [PATCH 01/14] nfsd: Add layouts checking for state resources References: <55A384B1.8030207@gmail.com> In-Reply-To: <55A384B1.8030207@gmail.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Layout is a state resource, nfsd should check it too. Signed-off-by: Kinglong Mee --- fs/nfsd/nfs4state.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 61dfb33..e0a4556 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -2241,6 +2241,7 @@ static bool client_has_state(struct nfs4_client *clp) * Also note we should probably be using this in 4.0 case too. */ return !list_empty(&clp->cl_openowners) + || !list_empty(&clp->cl_lo_states) || !list_empty(&clp->cl_delegations) || !list_empty(&clp->cl_sessions); } @@ -4257,8 +4258,9 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, goto out; clp = cstate->clp; status = nfserr_cb_path_down; - if (!list_empty(&clp->cl_delegations) - && clp->cl_cb_state != NFSD4_CB_UP) + if ((!list_empty(&clp->cl_delegations) + || !list_empty(&clp->cl_lo_states)) + && clp->cl_cb_state != NFSD4_CB_UP) goto out; status = nfs_ok; out: