This is a note to let you know that I've just added the patch titled
Revert "NFS: More fixes for nfs_direct_write_reschedule_io()"
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-nfs-more-fixes-for-nfs_direct_write_reschedule_io.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6367b15c4fe4714eab779f45577141ae8b484984 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 12 Oct 2023 19:41:37 +0200
Subject: Revert "NFS: More fixes for nfs_direct_write_reschedule_io()"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit edd1f06145101dab83497806bb6162641255ef50 which is
commit b11243f720ee5f9376861099019c8542969b6318 upstream.
There are reported NFS problems in the 6.1.56 release, so revert a set
of NFS patches to hopefully resolve the issue.
Reported-by: poester <poester@xxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20231012165439.137237-2-kernel@xxxxxxxxxxxx
Reported-by: Daniel Díaz <daniel.diaz@xxxxxxxxxx>
Link: https://lore.kernel.org/r/2023100755-livestock-barcode-fe41@gregkh
Cc: Trond Myklebust <trond.myklebust@xxxxxxxxxxxxxxx>
Cc: Anna Schumaker <Anna.Schumaker@xxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
fs/nfs/direct.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -782,23 +782,18 @@ static void nfs_write_sync_pgio_error(st
static void nfs_direct_write_reschedule_io(struct nfs_pgio_header *hdr)
{
struct nfs_direct_req *dreq = hdr->dreq;
- struct nfs_page *req;
- struct nfs_commit_info cinfo;
trace_nfs_direct_write_reschedule_io(dreq);
- nfs_init_cinfo_from_dreq(&cinfo, dreq);
spin_lock(&dreq->lock);
- if (dreq->error == 0)
+ if (dreq->error == 0) {
dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
- set_bit(NFS_IOHDR_REDO, &hdr->flags);
- spin_unlock(&dreq->lock);
- while (!list_empty(&hdr->pages)) {
- req = nfs_list_entry(hdr->pages.next);
- nfs_list_remove_request(req);
- nfs_unlock_request(req);
- nfs_mark_request_commit(req, NULL, &cinfo, 0);
+ /* fake unstable write to let common nfs resend pages */
+ hdr->verf.committed = NFS_UNSTABLE;
+ hdr->good_bytes = hdr->args.offset + hdr->args.count -
+ hdr->io_start;
}
+ spin_unlock(&dreq->lock);
}
static const struct nfs_pgio_completion_ops nfs_direct_write_completion_ops = {
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-6.1/revert-nfs-fix-o_direct-locking-issues.patch
queue-6.1/ata-libata-scsi-disable-scsi-device-manage_system_start_stop.patch
queue-6.1/lib-test_meminit-fix-off-by-one-error-in-test_pages.patch
queue-6.1/revert-nfs-fix-error-handling-for-o_direct-write-scheduling.patch
queue-6.1/scsi-do-not-rescan-devices-with-a-suspended-queue.patch
queue-6.1/net-prevent-address-rewrite-in-kernel_bind.patch
queue-6.1/asoc-amd-yc-fix-non-functional-mic-on-lenovo-82ym.patch
queue-6.1/hid-logitech-hidpp-fix-kernel-crash-on-receiver-usb-disconnect.patch
queue-6.1/revert-nfs-use-the-correct-commit-info-in-nfs_join_page_group.patch
queue-6.1/revert-nfs-more-fixes-for-nfs_direct_write_reschedule_io.patch
queue-6.1/revert-nfs-more-o_direct-accounting-fixes-for-error-paths.patch
queue-6.1/quota-fix-slow-quotaoff.patch
