From patchwork Mon Jan 4 18:21:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7949991 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BEBB99F350 for ; Mon, 4 Jan 2016 18:22:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E10C4202BE for ; Mon, 4 Jan 2016 18:22:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 192CD202B4 for ; Mon, 4 Jan 2016 18:22:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752376AbcADSWC (ORCPT ); Mon, 4 Jan 2016 13:22:02 -0500 Received: from mail-io0-f174.google.com ([209.85.223.174]:34772 "EHLO mail-io0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752289AbcADSV6 (ORCPT ); Mon, 4 Jan 2016 13:21:58 -0500 Received: by mail-io0-f174.google.com with SMTP id 1so116649052ion.1 for ; Mon, 04 Jan 2016 10:21:58 -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=TOBRxUwdR1aUIPF7miixtc7MhXr1PyxVInyFWnzAi00=; b=ByJLSYpBbIMDx6n5e/6UXGc9lBZi8ffbhYdjNNHSDgjB0MWXRuPC/VwVtsetlaRU6o LVa1eZecFOChJOVw2Qe5XSuGKpYuBt5dmtrzbNGlXZ1vG5J13MiykLaNdmxmWdj2v8QR 0o1AVWMXBQ46AbkYri+kgkihPgZ0Z7QP6Xun3vL2y49uhYBtSA0VDSJf/VuFef2pL61W Q2ONRn3GNNq2ZUXlLKtzGr0rtAdA/bKxE8ahSQMf8g2c1hmbCrLxg7OWOZCR+UZZ6C10 w6A67dO++tSBUkLn85d1i8HRSHXcJPSfnPl6geYsViwnRVKMXKTLlYYq1azZ1X5YWcBi MhRQ== 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=TOBRxUwdR1aUIPF7miixtc7MhXr1PyxVInyFWnzAi00=; b=jopCIiOZJzskjtAJjwgi+pvryq4XPIFjTLUrSDTxglKeyk3gO94bsuY4R5TRSsflsy 4hLwvBz8nMTo6QTmMuXnhRSJNFXAh1pbdCo0da1RoEgtIIkx+lDD8v78L5opT2KwwunH Oeux6M2zQbrXO2rgghKoZJHcwI6H2HYsO8DnNzORyJxtNaNPbRIBIo+ybBH4JiO13Sau Adgnw2FB8pjefr8XM9KmqkrPnuyyHxpUQfwVCyZSiixYco2RkDF/97hZkANNcu1S1FBU SfH3Ngj9NcQ659vJwtiUXr6Mb4Vahcb/n/qfl0gbuzbpBTEg3C+1EMhu79y4IwQDYoDF t7Xw== X-Gm-Message-State: ALoCoQnF2/FvxEgNHegsjba9Xa4P5hcCKV7o7+dFUvIJxK0eLWBccpLj0wd4hPkeXC94Mzm8BwLWPxcRx0yeq5J410OTcuCi4w== X-Received: by 10.107.169.225 with SMTP id f94mr80374477ioj.154.1451931717905; Mon, 04 Jan 2016 10:21:57 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jan 2016 10:21:57 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH v3 16/18] NFSv4.1/pNFS: Cleanup pnfs_mark_matching_lsegs_invalid() Date: Mon, 4 Jan 2016 13:21:14 -0500 Message-Id: <1451931676-68481-16-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451931676-68481-15-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> <1451931676-68481-13-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-14-git-send-email-trond.myklebust@primarydata.com> <1451931676-68481-15-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 Make it more obvious what we're returning... Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 8e1d4229bf2d..f86f060f853d 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -569,7 +569,7 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, struct pnfs_layout_range *recall_range) { struct pnfs_layout_segment *lseg, *next; - int invalid = 0, removed = 0; + int remaining = 0; dprintk("%s:Begin lo %p\n", __func__, lo); @@ -582,11 +582,11 @@ pnfs_mark_matching_lsegs_invalid(struct pnfs_layout_hdr *lo, "offset %llu length %llu\n", __func__, lseg, lseg->pls_range.iomode, lseg->pls_range.offset, lseg->pls_range.length); - invalid++; - removed += mark_lseg_invalid(lseg, tmp_list); + if (!mark_lseg_invalid(lseg, tmp_list)) + remaining++; } - dprintk("%s:Return %i\n", __func__, invalid - removed); - return invalid - removed; + dprintk("%s:Return %i\n", __func__, remaining); + return remaining; } /* note free_me must contain lsegs from a single layout_hdr */