From patchwork Mon Jan 4 18:21:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7949971 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 950C0BEEE5 for ; Mon, 4 Jan 2016 18:22:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BAF25202B4 for ; Mon, 4 Jan 2016 18:22:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CB2D8202B8 for ; Mon, 4 Jan 2016 18:22:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752325AbcADSV7 (ORCPT ); Mon, 4 Jan 2016 13:21:59 -0500 Received: from mail-ig0-f181.google.com ([209.85.213.181]:36080 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751390AbcADSVz (ORCPT ); Mon, 4 Jan 2016 13:21:55 -0500 Received: by mail-ig0-f181.google.com with SMTP id ph11so250741607igc.1 for ; Mon, 04 Jan 2016 10:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=primarydata-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=UDFbT1MG6SV67WLH5mU7Ly2xUDF0+hwaUold3QbUS/8=; b=MEC13V+OnMeTe3kJSAasBg/SMI6rpj7cSXHVizl3Imun/lQgp6Y+ZNMDvUuAn5i9BB 9X5yjXgOEpNxzka2BoCJ7tHypLUgIzjRGBYAiCjj2TYi0XUTr2F1ZfgK1VzSGMkCREwL WOJTAH4XinCK9MKXFK8qzY2n0Bfs3Cn/02ftN7aGhZp9B11OgS2Bq1vH/T8ZS/E2B8a6 3N5lAPlQ4T45qUT/c5WYjy7xuZvILn5nFCOjU49b5yqVXXJxPX/gvAdW1SKPRe1e+4AX uXBQgDgmfgSNA/e5Bp5fDMQW8EQBPnOjJb8gBm7ktgaPat8HYjKUWekkiD5zurRxoXpQ IClQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=UDFbT1MG6SV67WLH5mU7Ly2xUDF0+hwaUold3QbUS/8=; b=Vo0qpy/EwRzBqolD7a74HBJgfT8dH22PE2lUWGfpnMgHf67U/fqOOAuRZNYR14w3Qs F96UZ2waMe/61MxFk8UWaJhVn8jskI1uIQIQsSZ7Kxtk+Bdj/ZN5L7K5WCyyvViq91nu pU2pfJoPwo3YNIQjOUeIf4/pdTiUM6wzJ2hE0h1cIqFbIX8Nu7qW3jz28Vrxy4H7FO9s kVVjR9yJpvS/od2VKsYyxx52awmz6bcGXYhiOoW4nW3xWld9kT+qNYdL3IJhA5KVXigW NW6EGZM89JS/gDd1Za5isPhL+Xoaa/Nzl3F6BEIq0TvnUpjHyc2O85oirTVYgiExotyD lY1Q== X-Gm-Message-State: ALoCoQk8yr5Ncn++fUgd70ICS73gs6Y4WyNihYmiTprE3L9mdnRAeX8P1DMdsjf86Omn0dWt46EF84vATS9/hZKegEb0WMtaqA== X-Received: by 10.50.60.69 with SMTP id f5mr15771850igr.26.1451931715294; Mon, 04 Jan 2016 10:21:55 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-164-203.hsd1.mi.comcast.net. [68.49.164.203]) by smtp.gmail.com with ESMTPSA id n6sm12760568ige.12.2016.01.04.10.21.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2016 10:21:54 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 13/18] NFSv4.1/pNFS: pnfs_mark_matching_lsegs_return() should set the iomode Date: Mon, 4 Jan 2016 13:21:11 -0500 Message-Id: <1451931676-68481-13-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451931676-68481-12-git-send-email-trond.myklebust@primarydata.com> References: <1451931676-68481-1-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-2-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-3-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-4-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-5-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-6-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-7-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-8-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-9-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-10-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-11-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-12-git-send-email-trond.myklebust@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.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 If pnfs_mark_matching_lsegs_return() needs to mark a layout segment for return, then it must also set the return iomode. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 7e0f2b9a9b10..449c4782cab3 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1758,6 +1758,16 @@ out_forget_reply: goto out; } +static void +pnfs_set_plh_return_iomode(struct pnfs_layout_hdr *lo, enum pnfs_iomode iomode) +{ + if (lo->plh_return_iomode == iomode) + return; + if (lo->plh_return_iomode != 0) + iomode = IOMODE_ANY; + lo->plh_return_iomode = iomode; +} + void pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, struct list_head *tmp_list, @@ -1780,6 +1790,7 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, lseg->pls_range.offset, lseg->pls_range.length); set_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags); + pnfs_set_plh_return_iomode(lo, return_range->iomode); mark_lseg_invalid(lseg, tmp_list); set_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags); @@ -1801,10 +1812,7 @@ void pnfs_error_mark_layout_for_return(struct inode *inode, spin_lock(&inode->i_lock); /* set failure bit so that pnfs path will be retried later */ pnfs_layout_set_fail_bit(lo, iomode); - if (lo->plh_return_iomode == 0) - lo->plh_return_iomode = range.iomode; - else if (lo->plh_return_iomode != range.iomode) - lo->plh_return_iomode = IOMODE_ANY; + pnfs_set_plh_return_iomode(lo, range.iomode); /* * mark all matching lsegs so that we are sure to have no live * segments at hand when sending layoutreturn. See pnfs_put_lseg()