From patchwork Wed May 11 10:21:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9067451 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 1A54FBF29F for ; Wed, 11 May 2016 10:21:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3E692201B9 for ; Wed, 11 May 2016 10:21:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95AD5201BC for ; Wed, 11 May 2016 10:21:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932134AbcEKKVc (ORCPT ); Wed, 11 May 2016 06:21:32 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:35147 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932114AbcEKKV3 (ORCPT ); Wed, 11 May 2016 06:21:29 -0400 Received: by mail-qk0-f196.google.com with SMTP id n62so2438162qkc.2 for ; Wed, 11 May 2016 03:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yiltYXTN2oOC4JcsCJG9KCaZBjJTOeAqKf4M1ZYybIk=; b=r1jCDSAQIDWUWsessOLFOXS+xdqOcHFJBpLAUAL+y73e1dWaMnmatnnDV7e2z5TFfT 8+uMojNF6Lc0vF3LRRwNl9BbqrIy+nnyp7lEBVSBNhFukuew7L70SFYQjx7epf1sd+Tk NeTra8s2TyYDmS0GOeqfjahBeoUfx9FDWr9vprpH29t0Dxptgut253wFLCfd4xH6F0cH l373g8Im6Mfk+AkSzECTlGdNfCZG71ZFYeiTzwF9ojO/plj+dDUKSyTF+cHB1mGEa6sH V4eb8TjSpYq78EghzkgsSNv1YU5i0ydSSEqbHdaK11vqjb4TO4CU9Fq+5RITV+IG6b+7 FDaA== 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=yiltYXTN2oOC4JcsCJG9KCaZBjJTOeAqKf4M1ZYybIk=; b=iGPuAmyHA/4JFkSbWJyjClU4u+Q2ZxSixV+MYHGWya1jdcrqte7F1vF6RQYcEXGYlm NoS/cm5pwjAjSRfhLw4glhNgc1lREDD5nHFiBF85+1macl5DeDvbOeg6inn1CXeAHtyC 32Nh7UelMtkyDj8lLtiIvrkDv+coPzPrC3n6e4FHAK88kWQTIGWOVn9VSG2uAjvFAMfQ ntUT3/GQV1PBM9Txc697muYX6T4kYc0f3ynn3g72GEs5tI9O681rDLk5IwjUwglHpsyT hwoZeHsqmpDlDxLs33ZGpw6oIMvCOW0j+nGk0+ofpV1XiDnsIoieVErq4vb/rd5tSJcg u6MQ== X-Gm-Message-State: AOPr4FWKW+eEL7orxfIaA3zQO7NN0LRmv/1EfGTgL+ak4ycmdc1r2Kop29hEclfXYXHMZg== X-Received: by 10.55.103.134 with SMTP id b128mr2357344qkc.167.1462962088205; Wed, 11 May 2016 03:21:28 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id r127sm3048446qkf.47.2016.05.11.03.21.27 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 May 2016 03:21:27 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 5/9] flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED Date: Wed, 11 May 2016 06:21:10 -0400 Message-Id: <1462962074-6989-6-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462962074-6989-1-git-send-email-jeff.layton@primarydata.com> References: <1462962074-6989-1-git-send-email-jeff.layton@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=-8.2 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 Setting just the NFS_LAYOUT_RETURN_REQUESTED flag doesn't do anything, unless there are lsegs that are also being marked for return. At the point where that happens this flag is also set, so these set_bit calls don't do anything useful. Signed-off-by: Jeff Layton --- fs/nfs/flexfilelayout/flexfilelayout.c | 2 -- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 8 +------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 08cd5f856321..7955cb7862d4 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1249,8 +1249,6 @@ static int ff_layout_read_done_cb(struct rpc_task *task, hdr->pgio_mirror_idx + 1, &hdr->pgio_mirror_idx)) goto out_eagain; - set_bit(NFS_LAYOUT_RETURN_REQUESTED, - &hdr->lseg->pls_layout->plh_flags); pnfs_read_resend_pnfs(hdr); return task->tk_status; case -NFS4ERR_RESET_TO_MDS: diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index 56296f3df19c..5eff05e9eb4d 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -393,13 +393,7 @@ nfs4_ff_layout_prepare_ds(struct pnfs_layout_segment *lseg, u32 ds_idx, mirror, lseg->pls_range.offset, lseg->pls_range.length, NFS4ERR_NXIO, OP_ILLEGAL, GFP_NOIO); - if (!fail_return) { - if (ff_layout_has_available_ds(lseg)) - set_bit(NFS_LAYOUT_RETURN_REQUESTED, - &lseg->pls_layout->plh_flags); - else - pnfs_error_mark_layout_for_return(ino, lseg); - } else + if (fail_return || !ff_layout_has_available_ds(lseg)) pnfs_error_mark_layout_for_return(ino, lseg); ds = NULL; }