From patchwork Wed Jan 7 00:28:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5578191 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 19E7F9F507 for ; Wed, 7 Jan 2015 00:29:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 458A82010B for ; Wed, 7 Jan 2015 00:29:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5CB8F2024F for ; Wed, 7 Jan 2015 00:29:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754715AbbAGA3d (ORCPT ); Tue, 6 Jan 2015 19:29:33 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:62939 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754584AbbAGA3c (ORCPT ); Tue, 6 Jan 2015 19:29:32 -0500 Received: by mail-pa0-f51.google.com with SMTP id ey11so1059836pad.10 for ; Tue, 06 Jan 2015 16:29:32 -0800 (PST) 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=ZqeyuQ4HuLatsuRG2ako7OPGAL8X8j1xH3Vm86pQdZE=; b=X1puBtw5dBr36kjupKAF29bB36dtPXHiMFybJGpkARRIbZ/rKxmw0TXYvLlvc/xGEc OTVdrbR3s0GyKW7mVVs7Jco5E5R2FejCqp3/fNeKGWOPSK598tIryDtjHPWs6WMtDTdJ MpTYJeTYsVs1/Uh81npA4zhnJIXlz8Ix/lK5HsbEqlH9nOABqv6tdEkQV0naUE3iUetO uBrtCs2gFoDq5IE9LfC4CLvqNw2FBkIi395hJ2xie7E2LeAEyW3eeeOsksh9EIgNQDgQ 43mCgHZ4Z0zVYNUTQVqzOeT9kQUQFlQxgtsi6TKKv8UJFalXiYi2Xr1haAszGx7R8LoP RRZg== X-Gm-Message-State: ALoCoQlGO05yvUOlr6szLJnuS8FB5PmL4uueeMf1QYe6tGmjM9K2pVKBzAqcNhnjE/lqJVVte5Zk X-Received: by 10.66.141.71 with SMTP id rm7mr394618pab.20.1420590572211; Tue, 06 Jan 2015 16:29:32 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id wi15sm53763pac.21.2015.01.06.16.29.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jan 2015 16:29:31 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v3 20/49] nfs41: close a small race window when adding new layout to global list Date: Tue, 6 Jan 2015 16:28:25 -0800 Message-Id: <1420590534-84063-21-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1420590534-84063-1-git-send-email-loghyr@primarydata.com> References: <1420590534-84063-1-git-send-email-loghyr@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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_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 From: Peng Tao Signed-off-by: Peng Tao Signed-off-by: Tom Haynes --- fs/nfs/pnfs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 2d25670..fa00b56 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1288,7 +1288,6 @@ pnfs_update_layout(struct inode *ino, struct nfs_client *clp = server->nfs_client; struct pnfs_layout_hdr *lo; struct pnfs_layout_segment *lseg = NULL; - bool first; if (!pnfs_enabled_sb(NFS_SERVER(ino))) goto out; @@ -1321,16 +1320,15 @@ pnfs_update_layout(struct inode *ino, if (pnfs_layoutgets_blocked(lo, 0)) goto out_unlock; atomic_inc(&lo->plh_outstanding); - - first = list_empty(&lo->plh_layouts) ? true : false; spin_unlock(&ino->i_lock); - if (first) { + if (list_empty(&lo->plh_layouts)) { /* The lo must be on the clp list if there is any * chance of a CB_LAYOUTRECALL(FILE) coming in. */ spin_lock(&clp->cl_lock); - list_add_tail(&lo->plh_layouts, &server->layouts); + if (list_empty(&lo->plh_layouts)) + list_add_tail(&lo->plh_layouts, &server->layouts); spin_unlock(&clp->cl_lock); }