diff options
author | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 |
commit | b690490d6d466972ade172ee2e7f6ffa49e7e910 (patch) | |
tree | 50a93da28c9128e19eb7a3038aecf75dab6b36e1 /fs/ext4/ext4_jbd2.c | |
parent | HID: intel-ish-hid: Use dma_alloc_coherent for firmware update (diff) | |
parent | HID: amd_sfh: Remove useless DMA-32 fallback configuration (diff) | |
download | linux-b690490d6d466972ade172ee2e7f6ffa49e7e910.tar.xz linux-b690490d6d466972ade172ee2e7f6ffa49e7e910.zip |
Merge branch 'for-5.18/amd-sfh' into for-linus
- dead code elimination (Christophe JAILLET)
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
-rw-r--r-- | fs/ext4/ext4_jbd2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index 6def7339056d..3477a16d08ae 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c @@ -162,6 +162,8 @@ int __ext4_journal_ensure_credits(handle_t *handle, int check_cred, { if (!ext4_handle_valid(handle)) return 0; + if (is_handle_aborted(handle)) + return -EROFS; if (jbd2_handle_buffer_credits(handle) >= check_cred && handle->h_revoke_credits >= revoke_cred) return 0; |