From patchwork Tue Dec 16 19:01:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Haynes X-Patchwork-Id: 5502931 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8167B9F326 for ; Tue, 16 Dec 2014 19:02:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BADA4209D2 for ; Tue, 16 Dec 2014 19:02:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC882209C1 for ; Tue, 16 Dec 2014 19:02:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751256AbaLPTCn (ORCPT ); Tue, 16 Dec 2014 14:02:43 -0500 Received: from mail-pd0-f169.google.com ([209.85.192.169]:53733 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbaLPTCn (ORCPT ); Tue, 16 Dec 2014 14:02:43 -0500 Received: by mail-pd0-f169.google.com with SMTP id z10so14514229pdj.28 for ; Tue, 16 Dec 2014 11:02:43 -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=YuV9sPFkyi3OsvE0nChTUHBAiSFA1r8D/mk50J7c3xA0nIqKWDi7IxwEk39C5RZ2Pz 3UDA3UOtWRXRyyiPTcKuUU9ZP6nGlUyMCktuY9iCMpCW8TYwxebwKiuhIJfWOY75bwbr AVeX0/ym4lOpzCmZGl/x04ZiQTrQFFYbFVdygin+rfXZCxTgYSk+K4FRI0wBZvd66dVx wE5/xu9ux06Kztvw73efC6FR/KlmriyZqj0ib/CHl1lTomzc9C3czbECKl+pvToYRAbj CVNCTU4j98Hw5w2rNsaRXz/M4GVFMC/KhbaXdZwlXIRPuM+bPJoez3xAePmZ3ioC44Oc KMUA== X-Gm-Message-State: ALoCoQmpH6A3mRaMEg5yaglvvD24DRhetS2gX4/3mtHKDDs84XnaVyNLGFKuFIT176YzSHPdoVQr X-Received: by 10.68.222.199 with SMTP id qo7mr43748481pbc.14.1418756562630; Tue, 16 Dec 2014 11:02:42 -0800 (PST) Received: from localhost.localdomain ([50.242.95.105]) by mx.google.com with ESMTPSA id q4sm1620669pdh.79.2014.12.16.11.02.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Dec 2014 11:02:41 -0800 (PST) From: Tom Haynes X-Google-Original-From: Tom Haynes To: Trond Myklebust Cc: Linux NFS Mailing List Subject: [PATCH 20/50] nfs41: close a small race window when adding new layout to global list Date: Tue, 16 Dec 2014 11:01:23 -0800 Message-Id: <1418756513-95187-21-git-send-email-loghyr@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1418756513-95187-1-git-send-email-loghyr@primarydata.com> References: <1418756513-95187-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); }