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>

diff --git a/fs/netfs/direct_read.c b/fs/netfs/direct_read.c
index 5e3f0aeb51f31f6cdf24722c719472bdd0866cf3..f11a89f2fdd9af09093a59f7dfb938ddae2cc1fe 100644 (file)
--- 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 dc6b41ef18b0974870b7ad9d9c012c7e5888ff90..d6f8984f9f5bdb7fd8773eef8716583b0bb15baf 100644 (file)
--- 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) {

diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index 5f60d8e3a7efc14db726b2c79ce5ad0bc55f1aa3..cf634c28522d5fb0ac4b52378c839832d6242c12 100644 (file)
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -270,8 +270,6 @@ struct netfs_io_request {
 #define NETFS_RREQ_IN_PROGRESS         5       /* Unlocked when the request completes */
 #define NETFS_RREQ_FOLIO_COPY_TO_CACHE 6       /* Copy current folio to cache from read */
 #define NETFS_RREQ_UPLOAD_TO_SERVER    8       /* Need to write to the server */
-#define NETFS_RREQ_NONBLOCK            9       /* Don't block if possible (O_NONBLOCK) */
-#define NETFS_RREQ_BLOCKED             10      /* We blocked */
 #define NETFS_RREQ_PAUSE               11      /* Pause subrequest generation */
 #define NETFS_RREQ_USE_IO_ITER         12      /* Use ->io_iter rather than ->i_pages */
 #define NETFS_RREQ_ALL_QUEUED          13      /* All subreqs are now queued */