From patchwork Thu Aug 27 23:27:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 7088751 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 6F77D9F1C2 for ; Thu, 27 Aug 2015 23:27:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A7D19208C5 for ; Thu, 27 Aug 2015 23:27:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A0C822088B for ; Thu, 27 Aug 2015 23:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753096AbbH0X14 (ORCPT ); Thu, 27 Aug 2015 19:27:56 -0400 Received: from mail-qk0-f173.google.com ([209.85.220.173]:34850 "EHLO mail-qk0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752656AbbH0X14 (ORCPT ); Thu, 27 Aug 2015 19:27:56 -0400 Received: by qkbm65 with SMTP id m65so19818541qkb.2 for ; Thu, 27 Aug 2015 16:27:55 -0700 (PDT) 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; bh=FS1req1KfHROeQeBoSSqjfbe05uoBzjt2bizmqCABko=; b=k56oq8rZ/7yhv+tV8sjbUgQscWjs7sportK9JBC7GqUK1LYiD7A5j5/X2fPZavyzhH Yv6dGLjjE2vSXF57oceGpUmAUUSmNBUyB0eOZ0tHEz31ZACUpHB1sDuHm1ds3Or5Yosq g+A/YpQw8VYfbecVnYmdXYvdfhzSLrIDcUKVm8BFLaESdXmEQJ0BHeaxHJysgo7y5lyB /cXmTvWIjhosAAaToMLAZ21SCt1GdNORcO8c/eEOQGrN5aQKMBlQJEyf77COJv9t2HFN 1TFt6tlP4eYJc8h6PCxcWMb+6wc21aC/pHXSa4/PrqotTHHlFP0d6gVgLSjTUSfkBLCc uSZA== X-Gm-Message-State: ALoCoQnKNbEfDN0d0PtS8f71h3FHxnRC7ZRUeCW4iSkSN5747oPy6M4FgEZzWlG9mdJCQEcQS4OK X-Received: by 10.55.197.82 with SMTP id p79mr11298110qki.5.1440718075319; Thu, 27 Aug 2015 16:27:55 -0700 (PDT) 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 i196sm2173978qhc.22.2015.08.27.16.27.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Aug 2015 16:27:54 -0700 (PDT) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH] NFSv4.1/pNFS: pnfs_mark_matching_lsegs_return must notify of layout return Date: Thu, 27 Aug 2015 19:27:53 -0400 Message-Id: <1440718073-8294-1-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.4.3 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.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 It's not sufficient to just mark the layout segment for layout return. We also need to set the NFS_LAYOUT_RETURN_BEFORE_CLOSE flag in the layout header. Signed-off-by: Trond Myklebust --- fs/nfs/pnfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 914c1daf08df..4eec540de9ea 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1717,6 +1717,8 @@ pnfs_mark_matching_lsegs_return(struct pnfs_layout_hdr *lo, lseg->pls_range.length); set_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags); mark_lseg_invalid(lseg, tmp_list); + set_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, + &lo->plh_flags); } }