From patchwork Mon Apr 15 10:23:23 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: 2444511 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 6745E3FD1A for ; Mon, 15 Apr 2013 10:23:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753944Ab3DOKXk (ORCPT ); Mon, 15 Apr 2013 06:23:40 -0400 Received: from mail-da0-f47.google.com ([209.85.210.47]:34256 "EHLO mail-da0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750881Ab3DOKXk (ORCPT ); Mon, 15 Apr 2013 06:23:40 -0400 Received: by mail-da0-f47.google.com with SMTP id s35so2013593dak.34 for ; Mon, 15 Apr 2013 03:23:39 -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=zVd4yAgl/DE6EOjam9Ca+VoW8odoK2QnxVmOraRiM8s=; b=YDRvbUm6J375SenFFiNKkFjBu2vNMeCNUvvWj8XO9KvqbGn+6JLlzzpTJ9olqsg9WT qcf2Fkc2sUcq8OIjOw/mvrGs91a12x+lvh+h0jbp3sbGyhK8XDkHz2z9NKqN5L3BxYSx gIVn2l7c9VcyIRXGZa9UIGQtetH/qRC9nkgcYlHNSob3CSeLtEzfOqK6hin6KMvSW88O wYDT5nBDqiBBFe8VSjM4NfqyWdW707pBZvzkLIgVB+LYfuas99hhQ8eBXyhhmHa3PPE6 RUaP44BoVSzzdSyl5Q/phU2ezds9bVBc1KnlNKset7PMjVlE/7YrTLTuN0M0dq8Clksf oXIw== X-Received: by 10.66.150.165 with SMTP id uj5mr28713608pab.37.1366021419733; Mon, 15 Apr 2013 03:23:39 -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 b7sm9835465pba.39.2013.04.15.03.23.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 15 Apr 2013 03:23:39 -0700 (PDT) From: Kuan Kai Chiu To: ceph-devel@vger.kernel.org Cc: henry@bigtera.com, Kuan Kai Chiu Subject: [PATCH] mds: fix setting/removing xattrs on root Date: Mon, 15 Apr 2013 18:23:23 +0800 Message-Id: <1366021404-5812-2-git-send-email-big.chiu@bigtera.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1366021404-5812-1-git-send-email-big.chiu@bigtera.com> References: <1366021404-5812-1-git-send-email-big.chiu@bigtera.com> X-Gm-Message-State: ALoCoQmG/JpL6/D2mL9ErowC75TkozramJi1J/2cIbqUJD7SPb3wHGnJcBxyPc08EIV5MLcSmbcw 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. --- 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)); }