From patchwork Sun Mar 17 14:51:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 2283961 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 E0D81E016C for ; Sun, 17 Mar 2013 15:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932729Ab3CQOyC (ORCPT ); Sun, 17 Mar 2013 10:54:02 -0400 Received: from mga03.intel.com ([143.182.124.21]:30053 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932724Ab3CQOyA (ORCPT ); Sun, 17 Mar 2013 10:54:00 -0400 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 17 Mar 2013 07:54:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.84,859,1355126400"; d="scan'208";a="215704541" Received: from unknown (HELO zyan5-mobl.ccr.corp.intel.com) ([10.255.20.118]) by AZSMGA002.ch.intel.com with ESMTP; 17 Mar 2013 07:53:57 -0700 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org Cc: sage@inktank.com, greg@inktank.com, "Yan, Zheng" Subject: [PATCH 35/39] mds: clear dirty inode rstat if import fails Date: Sun, 17 Mar 2013 22:51:38 +0800 Message-Id: <1363531902-24909-36-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1363531902-24909-1-git-send-email-zheng.z.yan@intel.com> References: <1363531902-24909-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" Signed-off-by: Yan, Zheng Reviewed-by: Greg Farnum --- src/mds/CDir.cc | 1 + src/mds/Migrator.cc | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc index 34bd8d3..47b6753 100644 --- a/src/mds/CDir.cc +++ b/src/mds/CDir.cc @@ -1022,6 +1022,7 @@ void CDir::assimilate_dirty_rstat_inodes() for (elist::iterator p = dirty_rstat_inodes.begin_use_current(); !p.end(); ++p) { CInode *in = *p; + assert(in->is_auth()); if (in->is_frozen()) continue; diff --git a/src/mds/Migrator.cc b/src/mds/Migrator.cc index 0672d03..f563b8d 100644 --- a/src/mds/Migrator.cc +++ b/src/mds/Migrator.cc @@ -2052,6 +2052,8 @@ void Migrator::import_reverse(CDir *dir) in->clear_replica_map(); if (in->is_dirty()) in->mark_clean(); + in->clear_dirty_rstat(); + in->authlock.clear_gather(); in->linklock.clear_gather(); in->dirfragtreelock.clear_gather();