From patchwork Sun May 15 01:06:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9095781 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 82273BF440 for ; Sun, 15 May 2016 01:07:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B660120272 for ; Sun, 15 May 2016 01:07:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D440D20263 for ; Sun, 15 May 2016 01:07:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020AbcEOBHD (ORCPT ); Sat, 14 May 2016 21:07:03 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:36679 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753999AbcEOBHA (ORCPT ); Sat, 14 May 2016 21:07:00 -0400 Received: by mail-qk0-f196.google.com with SMTP id l68so11320546qkf.3 for ; Sat, 14 May 2016 18:07:00 -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=HL0qz6PzunysQygcFvFCuV16WJym6j3VoWGMAX3OHOM=; b=Q7sN8NnnTDCepBx+GVeSq/jeVHoNAwWjzOtrlyK34ztNTx0taZU3ylM8PyJ45PwtPo KSi4GVN+xTkPi2DiWY0nVDfHpKNGDt3kRkFGqgIiW2Pi3e/KnA675US8pJhTXkqrOv/1 BkjTMvh9aF01JzqJIma1qzi0VgKo1Eb0GNF6hJc2jaESifAlMczT16mfoS8MGOMUuJl8 rXWmLATRA9J8bWdMRX1mQmWUHLTGoQShdW32Ysidy8gQX5V73x2IluWgquJLlMHPpIHC vf+LhKHvRYNyC8sZTZGOTZ8M+hWNUlSNPyrzIgobfB2+bmVU4diNUagXGZnRGCLnEN9Q 9lIQ== 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=HL0qz6PzunysQygcFvFCuV16WJym6j3VoWGMAX3OHOM=; b=hVdnA672SeZFAxjOihy+CvhHLBbPjrh3+yQaInEFLZoB3EjWxegCeqCxvbGLewN6nW yuC8snuZC+4lWQ1v8Nd3ydmlIW1dEE3nJQSS6s0fSww2pCMSnVGwx0Ex58Zc0QnmsxA/ YcjiKaDUvWKOSREv+vGKUzPfU4lr4UwPCc1S83HhBXvUh5fp2l2jsFkae5ELTfr0iWNH A6bbQDKHSsR4hsnwLTYkdhkIqZ7UbkiYxA9mTbtos2TvAnGWd45ApCUxu0Yn8YaPa9vt Fd5J7mbAFjegWBjKQGmER5JW+azwNkbIuw3t3FmqYV3xcZK8zwrGXa0BUHc82TjmORnJ Sa2A== X-Gm-Message-State: AOPr4FVMENndWBFFHO8WeAf63vyNdkpEg9oZW1GfVptzZPwoD46Y5TzjHl8asNmapSU+HQ== X-Received: by 10.55.159.8 with SMTP id i8mr119893qke.29.1463274419994; Sat, 14 May 2016 18:06:59 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id d12sm11520330qhd.13.2016.05.14.18.06.59 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 14 May 2016 18:06:59 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: Trond Myklebust , Anna Schumaker Cc: linux-nfs@vger.kernel.org, hch@infradead.org Subject: [PATCH v3 08/13] flexfiles: remove pointless setting of NFS_LAYOUT_RETURN_REQUESTED Date: Sat, 14 May 2016 21:06:37 -0400 Message-Id: <1463274402-17746-9-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1463274402-17746-1-git-send-email-jeff.layton@primarydata.com> References: <1463274402-17746-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 127a65fa639a..1c902b01db9e 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1269,8 +1269,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 c52ca75081a8..5532cb14e800 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; }