From patchwork Fri Jan 4 09:02:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1931841 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 5FE9BDFABD for ; Fri, 4 Jan 2013 09:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754105Ab3ADJC5 (ORCPT ); Fri, 4 Jan 2013 04:02:57 -0500 Received: from mga01.intel.com ([192.55.52.88]:28255 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738Ab3ADJCp (ORCPT ); Fri, 4 Jan 2013 04:02:45 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 04 Jan 2013 01:02:45 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,409,1355126400"; d="scan'208";a="272790054" Received: from zyan5-mobl.sh.intel.com ([10.239.36.28]) by fmsmga002.fm.intel.com with ESMTP; 04 Jan 2013 01:02:44 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 17/29] mds: call maybe_eval_stray after removing a replica dentry Date: Fri, 4 Jan 2013 17:02:08 +0800 Message-Id: <1357290140-17044-18-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" MDCache::handle_cache_expire() processes dentries after inodes, so the MDCache::maybe_eval_stray() in MDCache::inode_remove_replica() always fails to remove stray inode because MDCache::eval_stray() checks if the stray inode's dentry is replicated. Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 3410b0f..5adf4b7 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -6120,9 +6120,11 @@ void MDCache::dentry_remove_replica(CDentry *dn, int from) // fix lock if (dn->lock.remove_replica(from)) mds->locker->eval_gather(&dn->lock); -} - + CDentry::linkage_t *dnl = dn->get_projected_linkage(); + if (dnl->is_primary()) + maybe_eval_stray(dnl->get_inode()); +} void MDCache::trim_client_leases() {