From patchwork Thu Apr 18 06:43:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuan Kai Chiu X-Patchwork-Id: 2457641 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 AC09CDF2E5 for ; Thu, 18 Apr 2013 06:44:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965607Ab3DRGoh (ORCPT ); Thu, 18 Apr 2013 02:44:37 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:62251 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965286Ab3DRGoh (ORCPT ); Thu, 18 Apr 2013 02:44:37 -0400 Received: by mail-pb0-f54.google.com with SMTP id xa7so3607pbc.27 for ; Wed, 17 Apr 2013 23:44:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=yEOeh1PePXSyf5IFOuuv2jngBRC8GUcd5ki5Q86nm8s=; b=LfQGV0puqDq8oVcWzFp7ayCqP2vU3YDamY58ZMlKaeObUbxEHbTJmdrHEdYpv6c7SY pQGwIy5qkVJJmaGC0EzlqZSUsLX0U67uEnlAJjkFwojx9GcfoBBfdcWyJyZE1lVYhpdx UcioeVG5kHG3NyDCgVE2NrfMUjpDXhxMJ6MDB0dnRVPqjF8ZcDnYmNAq9ErzvgHX9/oA HLJ7LLT5siaSOttmHa5eEaOBFGtZRCh40rmqL6dnPiDXv0mIytSFEkJSfPMXZmS3rk0P EaIjCR0LjQGz+S28j5JYIra1yeq5enP1fWWNk6BG/w3yx+kjxtYTujkzId3RrdzFcQDw 9F6A== X-Received: by 10.69.3.4 with SMTP id bs4mr12363971pbd.5.1366267476482; Wed, 17 Apr 2013 23:44:36 -0700 (PDT) Received: from localhost.localdomain (220-135-68-130.HINET-IP.hinet.net. [220.135.68.130]) by mx.google.com with ESMTPS id j13sm9778441pat.17.2013.04.17.23.44.34 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 17 Apr 2013 23:44:35 -0700 (PDT) From: Kuan Kai Chiu To: ceph-devel@vger.kernel.org Cc: Kuan Kai Chiu Subject: [PATCH 1/2] mds: fix setting/removing xattrs on root Date: Thu, 18 Apr 2013 14:43:25 +0800 Message-Id: <1366267406-1449-2-git-send-email-big.chiu@bigtera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366267406-1449-1-git-send-email-big.chiu@bigtera.com> References: <1366267406-1449-1-git-send-email-big.chiu@bigtera.com> X-Gm-Message-State: ALoCoQkpusgEXR/DrkQRlHgYxrDs5UkdtaS5X9fjXMw135JIOl2lfrvsTPh1AxBBHA8X/2x1MhA1 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org MDS crashes while journaling dirty root inode in handle_client_setxattr and handle_client_removexattr. We should use journal_dirty_inode to safely log root inode here. Signed-off-by: Kuan Kai Chiu --- src/mds/Server.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 11ab834..1e62dd2 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -3907,8 +3907,7 @@ void Server::handle_client_setxattr(MDRequest *mdr) mdlog->start_entry(le); le->metablob.add_client_req(req->get_reqid(), req->get_oldest_client_tid()); mdcache->predirty_journal_parents(mdr, &le->metablob, cur, 0, PREDIRTY_PRIMARY, false); - mdcache->journal_cow_inode(mdr, &le->metablob, cur); - le->metablob.add_primary_dentry(cur->get_projected_parent_dn(), true, cur); + mdcache->journal_dirty_inode(mdr, &le->metablob, cur); journal_and_reply(mdr, cur, 0, le, new C_MDS_inode_update_finish(mds, mdr, cur)); } @@ -3964,8 +3963,7 @@ void Server::handle_client_removexattr(MDRequest *mdr) mdlog->start_entry(le); le->metablob.add_client_req(req->get_reqid(), req->get_oldest_client_tid()); mdcache->predirty_journal_parents(mdr, &le->metablob, cur, 0, PREDIRTY_PRIMARY, false); - mdcache->journal_cow_inode(mdr, &le->metablob, cur); - le->metablob.add_primary_dentry(cur->get_projected_parent_dn(), true, cur); + mdcache->journal_dirty_inode(mdr, &le->metablob, cur); journal_and_reply(mdr, cur, 0, le, new C_MDS_inode_update_finish(mds, mdr, cur)); }