From patchwork Mon Nov 19 02:43:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zheng" X-Patchwork-Id: 1762171 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 74E1B3FCDE for ; Mon, 19 Nov 2012 02:44:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938Ab2KSCoD (ORCPT ); Sun, 18 Nov 2012 21:44:03 -0500 Received: from mga11.intel.com ([192.55.52.93]:17039 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752921Ab2KSCoB (ORCPT ); Sun, 18 Nov 2012 21:44:01 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 18 Nov 2012 18:44:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.83,275,1352102400"; d="scan'208";a="251134104" Received: from zyan5-mobl.sh.intel.com ([10.239.36.18]) by fmsmga002.fm.intel.com with ESMTP; 18 Nov 2012 18:44:00 -0800 From: "Yan, Zheng" To: ceph-devel@vger.kernel.org, sage@inktank.com Cc: "Yan, Zheng" Subject: [PATCH 09/16] mds: check parent inode's versionlock when propagating rstats Date: Mon, 19 Nov 2012 10:43:41 +0800 Message-Id: <1353293028-15238-10-git-send-email-zheng.z.yan@intel.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1353293028-15238-1-git-send-email-zheng.z.yan@intel.com> References: <1353293028-15238-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" To propagate rstats to one level up, we need lock both parent inode's nestlock and versionlock. Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 88a248b..690c2ed 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -1917,7 +1917,8 @@ void MDCache::predirty_journal_parents(Mutation *mut, EMetaBlob *blob, // rstat if (!primary_dn) { // don't update parent this pass - } else if (!linkunlink && !parent->inode->nestlock.can_wrlock(-1)) { + } else if (!linkunlink && !(parent->inode->nestlock.can_wrlock(-1) && + parent->inode->versionlock.can_wrlock())) { dout(20) << " unwritable parent nestlock " << parent->inode->nestlock << ", marking dirty rstat on " << *cur << dendl; cur->mark_dirty_rstat();