From patchwork Tue Oct 2 08:55:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1536461 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 2F5B1DF238 for ; Tue, 2 Oct 2012 08:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754863Ab2JBI4R (ORCPT ); Tue, 2 Oct 2012 04:56:17 -0400 Received: from mga03.intel.com ([143.182.124.21]:51424 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754858Ab2JBI4Q (ORCPT ); Tue, 2 Oct 2012 04:56:16 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 02 Oct 2012 01:56:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.80,522,1344236400"; d="scan'208";a="199528023" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.21.40]) by azsmga001.ch.intel.com with ESMTP; 02 Oct 2012 01:56:14 -0700 From: "Yan, Zheng" To: sage@inktank.com, ceph-devel@vger.kernel.org Cc: "Yan, Zheng" Subject: [PATCH 08/12] mds: Allow export subtrees in other MDS' stray directory Date: Tue, 2 Oct 2012 16:55:48 +0800 Message-Id: <1349168152-13281-8-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349168152-13281-1-git-send-email-zheng.z.yan@intel.com> References: <1349168152-13281-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" Stray migration is implemented by rename, it may create auth subtrees in other MDS' stray directory. Signed-off-by: Yan, Zheng --- src/mds/Migrator.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 5f727a9..98ab4e1 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -640,7 +640,8 @@ void Migrator::export_dir(CDir *dir, int dest) return; } - if (!dir->inode->is_base() && dir->inode->get_parent_dir()->get_inode()->is_stray()) { + if (!dir->inode->is_base() && + dir->inode->get_parent_dir()->ino() == MDS_INO_MDSDIR(mds->get_nodeid())) { dout(7) << "i won't export anything in stray" << dendl; return; }