From patchwork Fri Apr 18 18:44:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 4017721 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D177DBFF02 for ; Fri, 18 Apr 2014 18:46:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A9CB203AC for ; Fri, 18 Apr 2014 18:46:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 427CC203B7 for ; Fri, 18 Apr 2014 18:46:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754357AbaDRSqC (ORCPT ); Fri, 18 Apr 2014 14:46:02 -0400 Received: from mail-ie0-f182.google.com ([209.85.223.182]:54351 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753822AbaDRSpW (ORCPT ); Fri, 18 Apr 2014 14:45:22 -0400 Received: by mail-ie0-f182.google.com with SMTP id y20so1881068ier.41 for ; Fri, 18 Apr 2014 11:45:22 -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:cc:subject:date:message-id:in-reply-to :references; bh=Uk1aSLQHrSDux+Oycmb02CnLIEfsLN8h9+/Y+6p6Iek=; b=alpb7ZoDkfZf6Q5s8xwGQmSESmdFyWQUIsvR35unThur/OfKoc413EtSFQMjMfkyPZ 6DiygTzHnKSKk5xv+8tvVz6Vcgw3Q6oKBFQye8V41SgbKGwLvdLc+LYMiWGvx5+z0YSb ja8dqJlyVbgzYPCdhlMIFNwqBL4NTz6rmRHClhCbQxrOnC3podFEEzm3Ne6J5LQaBam5 t1WXcgY2ybQDy3UyFVUxXV4zDr4JKko86MqS9xzcF1JARBPDFzRyQLzrehKIHyU+2EVS d7/m/x5M+SuLw7plcLtwnsC/D5imj7Jw83XT9NgPy+gYglrbtV6Nh3a3qJbIDoI9mDl/ GSow== X-Gm-Message-State: ALoCoQmsL6jSnWxNEqjukkIW9G0/991V1ZG4MsTU/CMyr0Z8Xm4JKyX/LJD4oMlqDIXn5fDITVpg X-Received: by 10.42.201.212 with SMTP id fb20mr9548293icb.56.1397846722435; Fri, 18 Apr 2014 11:45:22 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-5-70.drr02.mskg.mi.frontiernet.net. [50.124.5.70]) by mx.google.com with ESMTPSA id j9sm6018922igu.10.2014.04.18.11.45.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Apr 2014 11:45:21 -0700 (PDT) From: Trond Myklebust To: Bruce Fields Cc: linux-nfs@vger.kernel.org Subject: [PATCH 11/70] NFSd: Ensure delegation setup is safe w.r.t. break_lease() Date: Fri, 18 Apr 2014 14:44:05 -0400 Message-Id: <1397846704-14567-12-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1397846704-14567-11-git-send-email-trond.myklebust@primarydata.com> References: <1397846704-14567-1-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-2-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-3-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-4-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-5-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-6-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-7-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-8-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-9-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-10-git-send-email-trond.myklebust@primarydata.com> <1397846704-14567-11-git-send-email-trond.myklebust@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=-7.5 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 Ensure that we add/remove the dl_perfile under the inode->i_lock Signed-off-by: Trond Myklebust --- fs/nfsd/nfs4state.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 85fcbc9ebd40..3656980b5d19 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -441,7 +441,9 @@ static void hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) { dp->dl_stid.sc_type = NFS4_DELEG_STID; + spin_lock(&fp->fi_inode->i_lock); list_add(&dp->dl_perfile, &fp->fi_delegations); + spin_unlock(&fp->fi_inode->i_lock); list_add(&dp->dl_perclnt, &dp->dl_stid.sc_client->cl_delegations); } @@ -449,13 +451,19 @@ hash_delegation_locked(struct nfs4_delegation *dp, struct nfs4_file *fp) static void unhash_delegation(struct nfs4_delegation *dp) { + struct nfs4_file *fp = dp->dl_file; + spin_lock(&state_lock); list_del_init(&dp->dl_perclnt); - list_del_init(&dp->dl_perfile); list_del_init(&dp->dl_recall_lru); + if (!list_empty(&dp->dl_perfile)) { + spin_lock(&fp->fi_inode->i_lock); + list_del_init(&dp->dl_perfile); + spin_unlock(&fp->fi_inode->i_lock); + } spin_unlock(&state_lock); - nfs4_put_deleg_lease(dp->dl_file); - put_nfs4_file(dp->dl_file); + nfs4_put_deleg_lease(fp); + put_nfs4_file(fp); dp->dl_file = NULL; }