From patchwork Thu May 5 18:24:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9026481 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 5921EBF440 for ; Thu, 5 May 2016 18:25:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 82558203C3 for ; Thu, 5 May 2016 18:24:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6D109203E3 for ; Thu, 5 May 2016 18:24:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751890AbcEESY5 (ORCPT ); Thu, 5 May 2016 14:24:57 -0400 Received: from mail-qg0-f47.google.com ([209.85.192.47]:34851 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753556AbcEESY4 (ORCPT ); Thu, 5 May 2016 14:24:56 -0400 Received: by mail-qg0-f47.google.com with SMTP id f74so44400623qge.2 for ; Thu, 05 May 2016 11:24:56 -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=QXljOd8pAmMw7l3YHUwv7VZ/3lArAOa1qmNSPc4FMb0=; b=YXqQSdv+GxbRa4oBozQuFaCc3oFP6y+/C5/lr2GKfeg+eS3VCp28Ix3tCXiTF0Uphk zw3ksd6kM7MyuQCUQ/MHxKFSi1bBLi08aIviBQbh8MPQ+QKiFHTfpSb+04xldSnhRwI0 omXXFuPIt/bc3xvmtROlXyC/+CJLPNXRWpucpOmpOQPWjkouwrWUOgT14W9J5oLqJcly HHi2pejvdOqnj6kwp2o/4DksNtTcJx7JnO8Lfw7jud5knSt9woYr7AxZ0sfa/PvlS4p8 KKceKacDS8IeqcXhKCFPyvOPso3o7Ya1AmYjwh/PJpujLIgM3/JVtL7itsmhfTnGrt9V iT9w== 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=QXljOd8pAmMw7l3YHUwv7VZ/3lArAOa1qmNSPc4FMb0=; b=AGid46drMDGR7/StUVMRiP/h6fk3jeCreoVCkbUlYWCuS4woea0Nn6eI+7Cj5mxBqZ C1ZXkt8PwpsWPO9iBflqqmA+AjWsZcfgJRkItUFB6CO4BFDWn731uq7v59GIZ/R2yUAh OIVW/OzBitE8JoFTp6CfyFvHk1t1qoiCcwFDkBreJ9j5myjnQjpArDQXvL0LLnMX4aOg I1MQg1vFi+u77wC7+X848qSaJFpXD082hQ8V6yzZb5+lhydcsTn5h3qT6DtxjuvM4ZiH xSYPzaUMzqsw280bjcxN/5iyGHixDr2Ctq4AWyRalVgs/CAOONzemMVS+DaU9fnpzrx+ wpDw== X-Gm-Message-State: AOPr4FXtHb74SDG5ZIzr2W8kvO/KAWv9tzGarCzEmYzznOT84kgHkGAzCgTDZhiexEtxTg== X-Received: by 10.140.91.194 with SMTP id z60mr15543121qgd.70.1462472695589; Thu, 05 May 2016 11:24:55 -0700 (PDT) Received: from tlielax.poochiereds.net ([2606:a000:1125:4074:3a60:77ff:fe93:a95d]) by smtp.googlemail.com with ESMTPSA id x136sm4049807qkb.27.2016.05.05.11.24.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 May 2016 11:24:54 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: linux-nfs@vger.kernel.org Cc: hch@lst.de, Anna.Schumaker@netapp.com Subject: [RFC PATCH 1/6] nfs: don't merge new ff lsegs with ones that have LAYOUTRETURN bit set Date: Thu, 5 May 2016 14:24:43 -0400 Message-Id: <1462472688-5663-2-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1462472688-5663-1-git-send-email-jeff.layton@primarydata.com> References: <1462472688-5663-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.9 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 Otherwise, we'll end up returning layouts that we've just received if the client issues a new LAYOUTGET prior to the LAYOUTRETURN. Signed-off-by: Jeff Layton --- fs/nfs/flexfilelayout/flexfilelayout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 61b27d99df18..0ee2613b8aa6 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -298,6 +298,8 @@ ff_lseg_merge(struct pnfs_layout_segment *new, { u64 new_end, old_end; + if (test_bit(NFS_LSEG_LAYOUTRETURN, &old->pls_flags)) + return false; if (new->pls_range.iomode != old->pls_range.iomode) return false; old_end = pnfs_calc_offset_end(old->pls_range.offset, @@ -318,8 +320,6 @@ ff_lseg_merge(struct pnfs_layout_segment *new, new_end); if (test_bit(NFS_LSEG_ROC, &old->pls_flags)) set_bit(NFS_LSEG_ROC, &new->pls_flags); - if (test_bit(NFS_LSEG_LAYOUTRETURN, &old->pls_flags)) - set_bit(NFS_LSEG_LAYOUTRETURN, &new->pls_flags); return true; }