]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
f2fs: avoid unnecessary fscrypt_finalize_bounce_page()
authorChao Yu <chao@kernel.org>
Mon, 15 Jun 2026 13:08:20 +0000 (21:08 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Mon, 22 Jun 2026 19:52:38 +0000 (19:52 +0000)
fscrypt_finalize_bounce_page() should be called only if we use fs layer
crypto, let's avoid unnecessary fscrypt_finalize_bounce_page() in error
path of f2fs_write_compressed_pages().

BTW, fscrypt_finalize_bounce_page() will check mapping of bounced page
before retrieving original page, so, previously it won't cause any issue
w/ fscrypt_finalize_bounce_page(), but still we'd better avoid coupling
w/ any logic inside fscrypt_finalize_bounce_page().

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/compress.c

index 372e07c58e21a53756aae671f2cb398738c12ef5..6e1c0ea9f6c9eb05adcf3d51b956f1945987891d 100644 (file)
@@ -1455,6 +1455,9 @@ unlock_continue:
 out_destroy_crypt:
        page_array_free(sbi, cic->rpages, cc->cluster_size);
 
+       if (!fio.encrypted)
+               goto out_put_cic;
+
        for (--i; i >= 0; i--) {
                if (!cc->cpages[i])
                        continue;