From patchwork Fri Jan 4 09:02:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1931981 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 4C6C4DFABD for ; Fri, 4 Jan 2013 09:03:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754200Ab3ADJDX (ORCPT ); Fri, 4 Jan 2013 04:03:23 -0500 Received: from mga01.intel.com ([192.55.52.88]:53494 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754085Ab3ADJCz (ORCPT ); Fri, 4 Jan 2013 04:02:55 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 04 Jan 2013 01:02:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,409,1355126400"; d="scan'208";a="272790111" Received: from zyan5-mobl.sh.intel.com ([10.239.36.28]) by fmsmga002.fm.intel.com with ESMTP; 04 Jan 2013 01:02:54 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 27/29] mds: check if stray dentry is needed Date: Fri, 4 Jan 2013 17:02:18 +0800 Message-Id: <1357290140-17044-28-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357290140-17044-1-git-send-email-zheng.z.yan@intel.com> References: <1357290140-17044-1-git-send-email-zheng.z.yan@intel.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org From: "Yan, Zheng" The necessity of stray dentry can change before the request acquires all locks. Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 2531005..1557b30 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -4531,11 +4531,14 @@ void Server::handle_client_unlink(MDRequest *mdr) // -- create stray dentry? -- CDentry *straydn = mdr->straydn; - if (dnl->is_primary() && !straydn) { - straydn = mdcache->get_or_create_stray_dentry(dnl->get_inode()); - mdr->pin(straydn); - mdr->straydn = straydn; - } + if (dnl->is_primary()) { + if (!straydn) { + straydn = mdcache->get_or_create_stray_dentry(dnl->get_inode()); + mdr->pin(straydn); + mdr->straydn = straydn; + } + } else if (straydn) + straydn = NULL; if (straydn) dout(10) << " straydn is " << *straydn << dendl; @@ -5274,11 +5277,14 @@ void Server::handle_client_rename(MDRequest *mdr) // -- create stray dentry? -- CDentry *straydn = mdr->straydn; - if (destdnl->is_primary() && !linkmerge && !straydn) { - straydn = mdcache->get_or_create_stray_dentry(destdnl->get_inode()); - mdr->pin(straydn); - mdr->straydn = straydn; - } + if (destdnl->is_primary() && !linkmerge) { + if (!straydn) { + straydn = mdcache->get_or_create_stray_dentry(destdnl->get_inode()); + mdr->pin(straydn); + mdr->straydn = straydn; + } + } else if (straydn) + straydn = NULL; if (straydn) dout(10) << " straydn is " << *straydn << dendl;