From patchwork Mon Jan 25 03:45:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dingdinghua X-Patchwork-Id: 43611 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 59DC01007D1 for ; Mon, 25 Jan 2010 15:12:44 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751410Ab0AYEMn (ORCPT ); Sun, 24 Jan 2010 23:12:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751476Ab0AYEMn (ORCPT ); Sun, 24 Jan 2010 23:12:43 -0500 Received: from [159.226.39.252] ([159.226.39.252]:34356 "EHLO bwstor.com.cn" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751410Ab0AYEMl (ORCPT ); Sun, 24 Jan 2010 23:12:41 -0500 X-Greylist: delayed 1667 seconds by postgrey-1.27 at vger.kernel.org; Sun, 24 Jan 2010 23:12:37 EST Received: from localhost ([159.226.39.251]) (authenticated bits=0) by bwstor.com.cn (8.13.8/8.13.8) with ESMTP id o0P3ip8R029710; Mon, 25 Jan 2010 11:44:53 +0800 From: dingdinghua To: linux-ext4@vger.kernel.org Cc: dingdinghua Subject: [PATCH 2/2] Jbd2: fix an assertion, jh->b_transaction should be Date: Mon, 25 Jan 2010 11:45:04 +0800 Message-Id: <1264391104-10950-3-git-send-email-dingdinghua@nrchpc.ac.cn> X-Mailer: git-send-email 1.5.5.6 In-Reply-To: <1264391104-10950-2-git-send-email-dingdinghua@nrchpc.ac.cn> References: <1264391104-10950-1-git-send-email-dingdinghua@nrchpc.ac.cn> <1264391104-10950-2-git-send-email-dingdinghua@nrchpc.ac.cn> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org --- fs/jbd2/commit.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 1bc74b6..28ad981 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -883,8 +883,7 @@ restart_loop: spin_unlock(&journal->j_list_lock); bh = jh2bh(jh); jbd_lock_bh_state(bh); - J_ASSERT_JH(jh, jh->b_transaction == commit_transaction || - jh->b_transaction == journal->j_running_transaction); + J_ASSERT_JH(jh, jh->b_transaction == commit_transaction); /* * If there is undo-protected committed data against