From patchwork Wed Dec 24 07:13:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5537081 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 1B6CD9F3CC for ; Wed, 24 Dec 2014 07:14:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 38279200F0 for ; Wed, 24 Dec 2014 07:14:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 66479201C0 for ; Wed, 24 Dec 2014 07:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751882AbaLXHOG (ORCPT ); Wed, 24 Dec 2014 02:14:06 -0500 Received: from mail-ig0-f171.google.com ([209.85.213.171]:53722 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821AbaLXHOE (ORCPT ); Wed, 24 Dec 2014 02:14:04 -0500 Received: by mail-ig0-f171.google.com with SMTP id z20so6582185igj.10 for ; Tue, 23 Dec 2014 23:14:03 -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=TNEz3ETvSS9eII4RkPJawt3TyFcvkCZHthBn74krFf8=; b=ShRHPliFQ0gnp0nQZ8ZYOv0ZLiHZoPPEFuI7dOAh8pb+W1BMy2N4fK3REdPU9/PUpS ARQWkbnEt3UaUYBCvbv+ubPR8hOr4q6pyGd2pGb1aigzrepINTDpPNy2zWh0i6pnNBvi AQLSE0pJWsC+vAqdTp/NFuMmLMuvCKvOtcWH77bsEwXenMAJ1KyrsSakLpelTyCkcmBE bYAvec5N4LwKBnOa/8qGs7/A1ZJmyZKjNbO6D62UNAKg4eW/41vQOx1oXyVabS6GDVyO Gre/9FKwdRaL/1QpZGfuhoURtEJWX+VQ081+VT/7nQ5S+oy9DyLkj0k2Fie3olSy2vrm qSiw== X-Gm-Message-State: ALoCoQliwHCXxqjmJdwqTVEfiY7nJ2ov6iuVXEj7h0e0S/zpJAGhLkUEOZQ8wqY7e6elhl5YizZp X-Received: by 10.43.154.138 with SMTP id le10mr24629348icc.50.1419405243238; Tue, 23 Dec 2014 23:14:03 -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.02 (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 29/49] nfs/filelayout: use pnfs_error_mark_layout_for_return Date: Tue, 23 Dec 2014 23:13:08 -0800 Message-Id: <1419405208-25975-30-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 Instead of calling layoutreturn directly, call pnfs_error_mark_layout_for_return to mark layouts for return and let generic code return layout when layout segments are freed. Signed-off-by: Peng Tao Signed-off-by: Tom Haynes Conflicts: fs/nfs/filelayout/filelayout.c --- fs/nfs/filelayout/filelayout.c | 2 +- fs/nfs/pnfs_nfsio.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index bfa8547..5d2eadc 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c @@ -200,7 +200,7 @@ static int filelayout_async_handle_error(struct rpc_task *task, dprintk("%s DS connection error %d\n", __func__, task->tk_status); nfs4_mark_deviceid_unavailable(devid); - set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags); + pnfs_error_mark_layout_for_return(inode, lseg); rpc_wake_up(&tbl->slot_tbl_waitq); /* fall through */ default: diff --git a/fs/nfs/pnfs_nfsio.c b/fs/nfs/pnfs_nfsio.c index 329447c..c6c3efc 100644 --- a/fs/nfs/pnfs_nfsio.c +++ b/fs/nfs/pnfs_nfsio.c @@ -13,20 +13,10 @@ #include "internal.h" #include "pnfs.h" -static void pnfs_generic_fenceme(struct inode *inode, - struct pnfs_layout_hdr *lo) -{ - if (!test_and_clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) - return; - pnfs_return_layout(inode); -} - void pnfs_generic_rw_release(void *data) { struct nfs_pgio_header *hdr = data; - struct pnfs_layout_hdr *lo = hdr->lseg->pls_layout; - pnfs_generic_fenceme(lo->plh_inode, lo); nfs_put_client(hdr->ds_clp); hdr->mds_ops->rpc_release(data); }