summaryrefslogtreecommitdiff
path: root/fs/jbd2
diff options
context:
space:
mode:
authorKemeng Shi <shikemeng@huaweicloud.com>2024-08-01 09:38:08 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-10-17 15:10:31 +0200
commit70fee3689acefc75a76426a52af43f40b9ca5707 (patch)
treefc2b9f8d53f2a1260c28f3de23018eb57d363291 /fs/jbd2
parentec7f8337c98ad281020ad1f11ba492462d80737a (diff)
downloadlinux-70fee3689acefc75a76426a52af43f40b9ca5707.tar.gz
linux-70fee3689acefc75a76426a52af43f40b9ca5707.tar.bz2
linux-70fee3689acefc75a76426a52af43f40b9ca5707.zip
jbd2: correctly compare tids with tid_geq function in jbd2_fc_begin_commit
commit f0e3c14802515f60a47e6ef347ea59c2733402aa upstream. Use tid_geq to compare tids to work over sequence number wraps. Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Zhang Yi <yi.zhang@huawei.com> Cc: stable@kernel.org Link: https://patch.msgid.link/20240801013815.2393869-2-shikemeng@huaweicloud.com Signed-off-by: Theodore Ts'o <tytso@mit.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/jbd2')
-rw-r--r--fs/jbd2/journal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index b10c144c6084..52ac0c7fd3fe 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -740,7 +740,7 @@ int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)
return -EINVAL;
write_lock(&journal->j_state_lock);
- if (tid <= journal->j_commit_sequence) {
+ if (tid_geq(journal->j_commit_sequence, tid)) {
write_unlock(&journal->j_state_lock);
return -EALREADY;
}