From: Greg Kroah-Hartman Date: Wed, 21 Feb 2024 10:16:24 +0000 (+0100) Subject: fix up nilfs patch X-Git-Tag: v4.19.307~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ca735e8bb52400321b8fc5e0fe8ebb6cbd2e9ba7;p=thirdparty%2Fkernel%2Fstable-queue.git fix up nilfs patch --- diff --git a/queue-4.19/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch b/queue-4.19/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch index 90404dc64c9..e458904fc52 100644 --- a/queue-4.19/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch +++ b/queue-4.19/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman + ret = nilfs_palloc_get_entry_block(dat, req->pr_entry_nr, + create, &req->pr_entry_bh); + if (unlikely(ret == -ENOENT)) { -+ nilfs_err(dat->i_sb, ++ nilfs_error(dat->i_sb, + "DAT doesn't have a block to manage vblocknr = %llu", + (unsigned long long)req->pr_entry_nr); + /* diff --git a/queue-5.4/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch b/queue-5.4/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch index 90404dc64c9..e458904fc52 100644 --- a/queue-5.4/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch +++ b/queue-5.4/nilfs2-replace-warn_ons-for-invalid-dat-metadata-block-requests.patch @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman + ret = nilfs_palloc_get_entry_block(dat, req->pr_entry_nr, + create, &req->pr_entry_bh); + if (unlikely(ret == -ENOENT)) { -+ nilfs_err(dat->i_sb, ++ nilfs_error(dat->i_sb, + "DAT doesn't have a block to manage vblocknr = %llu", + (unsigned long long)req->pr_entry_nr); + /*