This is a note to let you know that I've just added the patch titled
Revert "NFS: Fix O_DIRECT locking issues"
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-fix-o_direct-locking-issues.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 acea018acafb9b006c5b5c091d6caf1833ae3d57 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 12 Oct 2023 19:41:41 +0200
Subject: Revert "NFS: Fix O_DIRECT locking issues"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 4d98038e5bd939bd13cc4e602dfe60cd5110efa8 which is
commit 7c6339322ce0c6128acbe36aacc1eeb986dd7bf1 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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -555,7 +555,7 @@ static void nfs_direct_write_reschedule(
/* Bump the transmission count */
req->wb_nio++;
if (!nfs_pageio_add_request(&desc, req)) {
- spin_lock(&dreq->lock);
+ spin_lock(&cinfo.inode->i_lock);
if (dreq->error < 0) {
desc.pg_error = dreq->error;
} else if (desc.pg_error != -EAGAIN) {
@@ -565,7 +565,7 @@ static void nfs_direct_write_reschedule(
dreq->error = desc.pg_error;
} else
dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
- spin_unlock(&dreq->lock);
+ spin_unlock(&cinfo.inode->i_lock);
break;
}
nfs_release_request(req);
@@ -875,9 +875,9 @@ static ssize_t nfs_direct_write_schedule
/* If the error is soft, defer remaining requests */
nfs_init_cinfo_from_dreq(&cinfo, dreq);
- spin_lock(&dreq->lock);
+ spin_lock(&cinfo.inode->i_lock);
dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
- spin_unlock(&dreq->lock);
+ spin_unlock(&cinfo.inode->i_lock);
nfs_unlock_request(req);
nfs_mark_request_commit(req, NULL, &cinfo, 0);
desc.pg_error = 0;
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
