From nobody Fri Oct 18 05:19:47 2024 Received: from out-172.mta1.migadu.com (out-172.mta1.migadu.com [95.215.58.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 293DB157490 for ; Tue, 23 Jul 2024 15:44:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749461; cv=none; b=njN4VmkGsAHFvhlljs9uFSM4ARweY6w++YxesahIqDi3YWaMFd+8AkbIro1bR1UZUQ7MQ/6UOpg9XJO4kCmguNx6lB9P7zd55fs0je9wuZtOi7G6EG9vPPgPJD2BNfWVQCH6fE19lwbK45swtj68faeKXNl79mcoHrXtBTulNeA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749461; c=relaxed/simple; bh=3eT0Gfc/14vPUoa72UnAIh2nn5fg5CtRzqZF8RYE0Ao=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TkCXBy5kMLy2cbm9DCH0PIa6+0EowYm/TS0VXOUcOfi87WLvZQdV7YSCgqidCZKBA+n2SeyRBkmIB6P2nrOQq/LnWiYOxHUpBWExj/boQp0uNBOEeytOKhBLIv5sJwyRuKAG9IfwfQ8iwvUfSpOmlllsUbZ0l2ZWrijIO/WQhhQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=kN81NMho; arc=none smtp.client-ip=95.215.58.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="kN81NMho" X-Envelope-To: tytso@mit.edu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721749457; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kj4K3o8rgfDCBIGFPzvFnxTYJ7DeqVnEbJfP9Rg/3p4=; b=kN81NMhoRmlGyAmyKv6MPFGph515OOtn8gvG4f9PrGTzTA+sFAcErv618iJA4nDn5AEoK5 WU+xoDzUr5oWDNl+yxy5Ch0jNm7ZUjt7JKguh6+191kyMnJUX2+b5VwdOqE3jpOMbrkRu6 u15FHEhMS40UgW8IyCOZQ5GYPoJTRIE= X-Envelope-To: adilger@dilger.ca X-Envelope-To: jack@suse.cz X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: luis.henriques@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH 1/4] ext4: fix incorrect tid assumption in ext4_wait_for_tail_page_commit() Date: Tue, 23 Jul 2024 16:43:59 +0100 Message-ID: <20240723154402.21125-2-luis.henriques@linux.dev> In-Reply-To: <20240723154402.21125-1-luis.henriques@linux.dev> References: <20240723154402.21125-1-luis.henriques@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Function ext4_wait_for_tail_page_commit() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Don't assume that and invoke jbd2_log_wait_commit() if the journal had a committing transaction instead. Signed-off-by: Luis Henriques (SUSE) --- fs/ext4/inode.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 941c1c0d5c6e..e65fc2086701 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5279,8 +5279,9 @@ static void ext4_wait_for_tail_page_commit(struct ino= de *inode) { unsigned offset; journal_t *journal =3D EXT4_SB(inode->i_sb)->s_journal; - tid_t commit_tid =3D 0; + tid_t commit_tid; int ret; + bool has_transaction =3D false; =20 offset =3D inode->i_size & (PAGE_SIZE - 1); /* @@ -5305,12 +5306,13 @@ static void ext4_wait_for_tail_page_commit(struct i= node *inode) folio_put(folio); if (ret !=3D -EBUSY) return; - commit_tid =3D 0; read_lock(&journal->j_state_lock); - if (journal->j_committing_transaction) + if (journal->j_committing_transaction) { commit_tid =3D journal->j_committing_transaction->t_tid; + has_transaction =3D true; + } read_unlock(&journal->j_state_lock); - if (commit_tid) + if (has_transaction) jbd2_log_wait_commit(journal, commit_tid); } } From nobody Fri Oct 18 05:19:47 2024 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 34157157A6B for ; Tue, 23 Jul 2024 15:44:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749465; cv=none; b=mfNxAjgxZtGJuhEjV9PS4BHpkHsZPVjZ9mVKtJ45zXMC3cePJfZ9uMhM89EmctKrc1qu3dzPXBtKasfSJEIxYce67XGSwI6xbF7a3Mru5HnkXkbaBXGAxuV5lEX7XFXOV9j+WaYdbBKUmBNa4toKNI/i4cqGHECRbDK/qvz5QsY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749465; c=relaxed/simple; bh=TA7W0pcxd/Eb0Vc0SGJlJR1RToLMmy29uT+Pri3wrDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W+C4qJMOMYw77foIJpDxdB/0UCHzqUfxVfszCSFvnUB61YnV5UtXfLFCuR+/R+/cmj5WxuzVWTqu1oKXA6h+kMIHdDiUGamFjZDpUQFEF7T6rhkrHxcIkP9vk7hh35iqpx2aJyhc6ZJEy2ZEm5HK19JemdmC9giurcKiKhzKRXY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=rNAMjQzH; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="rNAMjQzH" X-Envelope-To: tytso@mit.edu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721749461; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OCQDY39ftFCrPmBUE2fSsNAe1oUYALwUXrxgaHtT78I=; b=rNAMjQzHp6gz96BOMWcSXgxujUT5aMsp3ZtuFZ0R93ex24p/zBr+pWltm0Yt4SyzAJ2vdJ mYAkDm257Puk1iE+Rek54tMh9Dh9UMc9lLqhldFCQYuCvjMwHJxZ0OUkt//oxOuvrMOHS/ p1Dp6vc/HFh1wzo9TBo2GTQhP4n/Puo= X-Envelope-To: adilger@dilger.ca X-Envelope-To: jack@suse.cz X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: luis.henriques@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH 2/4] ext4: fix incorrect tid assumption in __jbd2_log_wait_for_space() Date: Tue, 23 Jul 2024 16:44:00 +0100 Message-ID: <20240723154402.21125-3-luis.henriques@linux.dev> In-Reply-To: <20240723154402.21125-1-luis.henriques@linux.dev> References: <20240723154402.21125-1-luis.henriques@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Function __jbd2_log_wait_for_space() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Don't assume that and invoke jbd2_log_wait_commit() if the journal had a committing transaction instead. Signed-off-by: Luis Henriques (SUSE) Reviewed-by: Jan Kara --- fs/jbd2/checkpoint.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 951f78634adf..77bc522e6821 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -79,9 +79,12 @@ __releases(&journal->j_state_lock) if (space_left < nblocks) { int chkpt =3D journal->j_checkpoint_transactions !=3D NULL; tid_t tid =3D 0; + bool has_transaction =3D false; =20 - if (journal->j_committing_transaction) + if (journal->j_committing_transaction) { tid =3D journal->j_committing_transaction->t_tid; + has_transaction =3D true; + } spin_unlock(&journal->j_list_lock); write_unlock(&journal->j_state_lock); if (chkpt) { @@ -89,7 +92,7 @@ __releases(&journal->j_state_lock) } else if (jbd2_cleanup_journal_tail(journal) =3D=3D 0) { /* We were able to recover space; yay! */ ; - } else if (tid) { + } else if (has_transaction) { /* * jbd2_journal_commit_transaction() may want * to take the checkpoint_mutex if JBD2_FLUSHED From nobody Fri Oct 18 05:19:47 2024 Received: from out-188.mta1.migadu.com (out-188.mta1.migadu.com [95.215.58.188]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6F8D9157489 for ; Tue, 23 Jul 2024 15:44:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.188 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749468; cv=none; b=QXrPu8xNYY+PS0sxSLfCdHNeJ5wTef6RKpd9O67LpwVSpy/ounEnKttn9RmlNBKyGzGN/9VXKp1krIorTEo0pLkxV3O6OzMrL70SVwWD3s2/+UffX3iuLvLI/frFK3KI3B39doXvA0fUDlxSV2DSPymAfwalwuNO+rUS0T/1xgs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749468; c=relaxed/simple; bh=Bxkl0Hsq/C8M5vztSXAU7ypBDTyy8EAXeWXTtS31tww=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BPTpxn0NDTGo9ssB570aHadasqT8bRrNyZNn571yH8tYRFzRrN+g00ncVlPfE/24NvnLc5mU8ikFxiPwjQJB9aGrEsTr677PFymBVrjpz5UkS9n0dI+uDjV2UhAwDHYA4oRlBH8xOaolmk/SYoztAsJoWb3zOiQOPX+2qvDX0CU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=dreQwsXf; arc=none smtp.client-ip=95.215.58.188 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="dreQwsXf" X-Envelope-To: tytso@mit.edu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721749465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rz9lvD/QnXWNWbo/BvxmhM9orJ0FJCtlryAD6j/pNsA=; b=dreQwsXfs96IstFiRI1hPoQfQqqUhB116zeyx2xnP7tnJ+ZGwLcg0kgvZTqiwmRqvA+869 AQJTft3iLRrg23gf3XUyPXGVFdp8pm34oQaDS1lN01fHTwHojAwhsMUaEkb2QiO3WNuCMD heAKdE44lTrFIu/gGUNqjzJQGBPLLoM= X-Envelope-To: adilger@dilger.ca X-Envelope-To: jack@suse.cz X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: luis.henriques@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH 3/4] ext4: fix incorrect tid assumption in jbd2_journal_shrink_checkpoint_list() Date: Tue, 23 Jul 2024 16:44:01 +0100 Message-ID: <20240723154402.21125-4-luis.henriques@linux.dev> In-Reply-To: <20240723154402.21125-1-luis.henriques@linux.dev> References: <20240723154402.21125-1-luis.henriques@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Function jbd2_journal_shrink_checkpoint_list() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Don't assume that and use two extra boolean variables to control the loop iterations and keep track of the first and last tid. Signed-off-by: Luis Henriques (SUSE) --- fs/jbd2/checkpoint.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c index 77bc522e6821..f5a594237b7a 100644 --- a/fs/jbd2/checkpoint.c +++ b/fs/jbd2/checkpoint.c @@ -410,6 +410,7 @@ unsigned long jbd2_journal_shrink_checkpoint_list(journ= al_t *journal, tid_t tid =3D 0; unsigned long nr_freed =3D 0; unsigned long freed; + bool is_first =3D true, is_last =3D false; =20 again: spin_lock(&journal->j_list_lock); @@ -429,8 +430,10 @@ unsigned long jbd2_journal_shrink_checkpoint_list(jour= nal_t *journal, else transaction =3D journal->j_checkpoint_transactions; =20 - if (!first_tid) + if (is_first) { first_tid =3D transaction->t_tid; + is_first =3D false; + } last_transaction =3D journal->j_checkpoint_transactions->t_cpprev; next_transaction =3D transaction; last_tid =3D last_transaction->t_tid; @@ -455,12 +458,13 @@ unsigned long jbd2_journal_shrink_checkpoint_list(jou= rnal_t *journal, } else { journal->j_shrink_transaction =3D NULL; next_tid =3D 0; + is_last =3D true; } =20 spin_unlock(&journal->j_list_lock); cond_resched(); =20 - if (*nr_to_scan && next_tid) + if (*nr_to_scan && !is_last) goto again; out: trace_jbd2_shrink_checkpoint_list(journal, first_tid, tid, last_tid, From nobody Fri Oct 18 05:19:47 2024 Received: from out-181.mta1.migadu.com (out-181.mta1.migadu.com [95.215.58.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 229E71581EA for ; Tue, 23 Jul 2024 15:44:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749470; cv=none; b=Xhc0zaZJzeOXmutbaMuhgaDHPQjo/D2Jw0EaEyzmMNBiNbdv3BUAmYXccINiNPYp3llxLpg8R+k6GZNPNBoyF2NeBPfScDpWfjHn4eC+Dm+5cWrkrxQKNHa9FmrK7kmjwyYTMW9YdV0OSFZ5459DlsTV7aU+mrICiMhMxcT88Xw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721749470; c=relaxed/simple; bh=mC9XUkBEmBGvQ/1v65xdhYwMOgTCWbf0qM7hQ/txwzQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Sbx5WAYvoHtaJj3LwvGPFpztDXYYX36Pxn+gnepQ3veS2q632I7hAsqCRrDYFQ/MbhSv/z+n/znSUIPN8BueIjVj4btADA8e7FAa00Gvb5rc7NNHUEJlJJtvki/ZZMIhlABcTGeR2jt9h1SoZU4mRzs3LeTXQw/8ZvgjcfppSR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=bE0rY3bE; arc=none smtp.client-ip=95.215.58.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="bE0rY3bE" X-Envelope-To: tytso@mit.edu DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1721749467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KLM9/Us9GCDfVvEc9yizXeEQrxaXeLzRCwS/pBXR42I=; b=bE0rY3bEQPbvprDH30aWtRSCx3PF2dIxxdkd9Rc5qdQgqiO95s2iSaQiKlpwKTJrdmil96 zUag3JFIgATjM2j61KRDkRkDo/nh3erZlkjQ3LCcOBFMUWkFeFAyE1slhSE5NDB7ON6f8Q 5Y9263u4h4EV7o5RFcnbiaoK7m5UUgA= X-Envelope-To: adilger@dilger.ca X-Envelope-To: jack@suse.cz X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: luis.henriques@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH 4/4] ext4: fix incorrect tid assumption in ext4_fc_mark_ineligible() Date: Tue, 23 Jul 2024 16:44:02 +0100 Message-ID: <20240723154402.21125-5-luis.henriques@linux.dev> In-Reply-To: <20240723154402.21125-1-luis.henriques@linux.dev> References: <20240723154402.21125-1-luis.henriques@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" Function jbd2_journal_shrink_checkpoint_list() assumes that '0' is not a valid value for transaction IDs, which is incorrect. Furthermore, the sbi->s_fc_ineligible_tid handling also makes the same assumption by being initialised to '0'. Fortunately, the sb flag EXT4_MF_FC_INELIGIBLE can be used to check whether sbi->s_fc_ineligible_tid has been previously set instead of comparing it with '0'. Signed-off-by: Luis Henriques (SUSE) Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 3926a05eceee..3e0793cfea38 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -339,22 +339,29 @@ void ext4_fc_mark_ineligible(struct super_block *sb, = int reason, handle_t *handl { struct ext4_sb_info *sbi =3D EXT4_SB(sb); tid_t tid; + bool has_transaction =3D true; + bool is_ineligible; =20 if (ext4_fc_disabled(sb)) return; =20 - ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE); if (handle && !IS_ERR(handle)) tid =3D handle->h_transaction->t_tid; else { read_lock(&sbi->s_journal->j_state_lock); - tid =3D sbi->s_journal->j_running_transaction ? - sbi->s_journal->j_running_transaction->t_tid : 0; + if (sbi->s_journal->j_running_transaction) + tid =3D sbi->s_journal->j_running_transaction->t_tid; + else + has_transaction =3D false; read_unlock(&sbi->s_journal->j_state_lock); } spin_lock(&sbi->s_fc_lock); - if (tid_gt(tid, sbi->s_fc_ineligible_tid)) + is_ineligible =3D ext4_test_mount_flag(sb, EXT4_MF_FC_INELIGIBLE); + if (has_transaction && + ((!is_ineligible) || + (is_ineligible && tid_gt(tid, sbi->s_fc_ineligible_tid)))) sbi->s_fc_ineligible_tid =3D tid; + ext4_set_mount_flag(sb, EXT4_MF_FC_INELIGIBLE); spin_unlock(&sbi->s_fc_lock); WARN_ON(reason >=3D EXT4_FC_REASON_MAX); sbi->s_fc_stats.fc_ineligible_reason_count[reason]++;