aboutsummaryrefslogtreecommitdiffstats
path: root/fs/netfs
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@ionos.com>2025-05-19 14:48:07 +0100
committerChristian Brauner <brauner@kernel.org>2025-05-21 14:34:38 +0200
commit4b1ca12dd3f2529dc788cf4f18259ed62006ccb8 (patch)
treecf79e22e356297d2917743822be419ef1960caed /fs/netfs
parent67b916719a15c33fd18d6e8298828caeef428d00 (diff)
downloadtip-4b1ca12dd3f2529dc788cf4f18259ed62006ccb8.tar.gz
fs/netfs: remove unused flag NETFS_RREQ_BLOCKED
NETFS_RREQ_BLOCKED was added by commit 016dc8516aec ("netfs: Implement unbuffered/DIO read support") but has never been used either. Without NETFS_RREQ_BLOCKED, NETFS_RREQ_NONBLOCK makes no sense, and thus can be removed as well. Signed-off-by: Max Kellermann <max.kellermann@ionos.com> Signed-off-by: David Howells <dhowells@redhat.com> Link: https://lore.kernel.org/20250519134813.2975312-12-dhowells@redhat.com cc: Paulo Alcantara <pc@manguebit.com> cc: netfs@lists.linux.dev cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'fs/netfs')
-rw-r--r--fs/netfs/direct_read.c3
-rw-r--r--fs/netfs/objects.c2
2 files changed, 0 insertions, 5 deletions
diff --git a/fs/netfs/direct_read.c b/fs/netfs/direct_read.c
index 5e3f0aeb51f31f..f11a89f2fdd9af 100644
--- a/fs/netfs/direct_read.c
+++ b/fs/netfs/direct_read.c
@@ -106,9 +106,6 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq)
netfs_wait_for_pause(rreq);
if (test_bit(NETFS_RREQ_FAILED, &rreq->flags))
break;
- if (test_bit(NETFS_RREQ_BLOCKED, &rreq->flags) &&
- test_bit(NETFS_RREQ_NONBLOCK, &rreq->flags))
- break;
cond_resched();
} while (size > 0);
diff --git a/fs/netfs/objects.c b/fs/netfs/objects.c
index dc6b41ef18b097..d6f8984f9f5bdb 100644
--- a/fs/netfs/objects.c
+++ b/fs/netfs/objects.c
@@ -64,8 +64,6 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping,
}
__set_bit(NETFS_RREQ_IN_PROGRESS, &rreq->flags);
- if (file && file->f_flags & O_NONBLOCK)
- __set_bit(NETFS_RREQ_NONBLOCK, &rreq->flags);
if (rreq->netfs_ops->init_request) {
ret = rreq->netfs_ops->init_request(rreq, file);
if (ret < 0) {