From patchwork Wed Jan 14 16:44:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5633341 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 783DF9F357 for ; Wed, 14 Jan 2015 16:46:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92D6F200F4 for ; Wed, 14 Jan 2015 16:46:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A10F6200D4 for ; Wed, 14 Jan 2015 16:46:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753695AbbANQpj (ORCPT ); Wed, 14 Jan 2015 11:45:39 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:62599 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753576AbbANQph (ORCPT ); Wed, 14 Jan 2015 11:45:37 -0500 Received: by mail-pa0-f44.google.com with SMTP id et14so11530082pad.3 for ; Wed, 14 Jan 2015 08:45:37 -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=FEy7/IFb/nFFaaVVqoh1Aj7NVKoek+kIHLKGeNCUr86oVCvDS88tDclTmdtdKeJyI0 vTkDJKLezEMR4WKddAdtbSad7uNqwC5mzBOukaw1TBeFRKiVwwh4ZNoOuViUo4N8YQ7M h1rxYUBn8FD9oUYgIXQHx2sorVOkBitGv+uvBzz9Q2JqqXdf0/LYNsXj6S+vrUizVWTZ D94nTHhEXbeXyn9zsZ12DCyiql7nBeXjwdwLAc2JyczRPyRLXrDnPKXdfwhz05hgTk/0 9A8Asuf2miQ4YKQFEIOiJJW8ZSB2Mh09R+wOrhLeKmz+0TiXDuQp3D9a05+sKEqlqy4v 9zJw== X-Gm-Message-State: ALoCoQkUGTg7IIS8MfFr1hQCMUFcq5yDNQkGIJlihTAnvurFnwUcwOhfLHzHckpJxT35bnVzZMuw X-Received: by 10.70.96.8 with SMTP id do8mr7187360pdb.154.1421253937269; Wed, 14 Jan 2015 08:45:37 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id u7sm12239039pdp.45.2015.01.14.08.45.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jan 2015 08:45:36 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing list Subject: [PATCH v4 20/50] nfs41: close a small race window when adding new layout to global list Date: Wed, 14 Jan 2015 08:44:26 -0800 Message-Id: <1421253896-73106-21-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1421253896-73106-1-git-send-email-loghyr@primarydata.com> References: <1421253896-73106-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); }