From patchwork Fri Jan 4 09:02:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1931931 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 24561DFABD for ; Fri, 4 Jan 2013 09:03:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179Ab3ADJDN (ORCPT ); Fri, 4 Jan 2013 04:03:13 -0500 Received: from mga01.intel.com ([192.55.52.88]:38624 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091Ab3ADJCw (ORCPT ); Fri, 4 Jan 2013 04:02:52 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 04 Jan 2013 01:02:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,409,1355126400"; d="scan'208";a="272790095" Received: from zyan5-mobl.sh.intel.com ([10.239.36.28]) by fmsmga002.fm.intel.com with ESMTP; 04 Jan 2013 01:02:51 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 24/29] mds: rdlock prepended dest trace when handling rename Date: Fri, 4 Jan 2013 17:02:15 +0800 Message-Id: <1357290140-17044-25-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" rdlock prepended dest trace to prevent them from being xlocked by someone else. Signed-off-by: Yan, Zheng --- src/mds/Server.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 8d05a37..119af98 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -5228,6 +5228,7 @@ void Server::handle_client_rename(MDRequest *mdr) while (destbase != srcbase) { desttrace.insert(desttrace.begin(), destbase->get_projected_parent_dn()); + rdlocks.insert(&desttrace[0]->lock); dout(10) << "rename prepending desttrace with " << *desttrace[0] << dendl; destbase = destbase->get_projected_parent_dn()->get_dir()->get_inode(); }