From patchwork Wed Dec 24 07:13:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5537251 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 89EA99F3CC for ; Wed, 24 Dec 2014 07:14:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6FC5201C7 for ; Wed, 24 Dec 2014 07:14:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2C3A201B9 for ; Wed, 24 Dec 2014 07:14:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751860AbaLXHO3 (ORCPT ); Wed, 24 Dec 2014 02:14:29 -0500 Received: from mail-ie0-f180.google.com ([209.85.223.180]:59447 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751723AbaLXHOD (ORCPT ); Wed, 24 Dec 2014 02:14:03 -0500 Received: by mail-ie0-f180.google.com with SMTP id rp18so7282537iec.11 for ; Tue, 23 Dec 2014 23:14:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8dWG6NnfV9B6GJoANRFKa6Qt9nqDPN0TBASZyW0DtMI=; b=NJ96uOgXnmxUPadrvtRmJ7Tw3iqFEMwznrV8oR1sh8M6GWgNl8GtHqxDGJj8vDzimW gYqawADTRZeGF6f2I7PXjmrOiidsYVe3FENC3fkzvQ40kTTXUuiMvlQHs9xJ8qDJbM99 L9lvPzS8waZbTc6Nk3BwHSPVyQ/Xq8Cyw8TowLc3DbzCvOhTi1GsjluQzKVcIvHGBF2L EyOZGdEalSmIYqxn1+eYYgtvxmfIkvgtPZKL/jqcHBrGoBR+UqHtzrDYAcZIahewL7yD jMNCeMYHhcN1igiLmsiMGlOOeeBA0s0NUjItmjZ4xzGKn1jFT1KpWcEnd2YCPxcEWgwu MVjg== X-Gm-Message-State: ALoCoQlmw6PXTrCcmkwIp3QewmsCyKthDI3zkRu+09MecBX1WeFv0OtQ9IcO+Kz1F3/PzKPNm5dK X-Received: by 10.42.72.138 with SMTP id o10mr24529305icj.73.1419405242646; Tue, 23 Dec 2014 23:14:02 -0800 (PST) Received: from localhost.localdomain (c-68-40-185-14.hsd1.mi.comcast.net. [68.40.185.14]) by mx.google.com with ESMTPSA id 37sm8821410iog.39.2014.12.23.23.14.01 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Dec 2014 23:14:02 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing List Subject: [PATCH v2 28/49] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Date: Tue, 23 Dec 2014 23:13:07 -0800 Message-Id: <1419405208-25975-29-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1419405208-25975-1-git-send-email-loghyr@primarydata.com> References: <1419405208-25975-1-git-send-email-loghyr@primarydata.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=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 From: Peng Tao So that pnfs path is not disabled for ever. Signed-off-by: Peng Tao Signed-off-by: Tom Haynes --- fs/nfs/nfs4proc.c | 1 + fs/nfs/pnfs.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index b5bbe35..bf5ef58 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7786,6 +7786,7 @@ static void nfs4_layoutreturn_release(void *calldata) spin_lock(&lo->plh_inode->i_lock); if (lrp->res.lrs_present) pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); + clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags); lo->plh_block_lgets--; spin_unlock(&lo->plh_inode->i_lock); pnfs_put_layout_hdr(lrp->args.layout); diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index e9acfcf..63992c8 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -921,6 +921,11 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid, status = nfs4_proc_layoutreturn(lrp); out: + if (status) { + spin_lock(&ino->i_lock); + clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags); + spin_unlock(&ino->i_lock); + } dprintk("<-- %s status: %d\n", __func__, status); return status; }