Unverified Commit 4b1ca12d authored by Max Kellermann's avatar Max Kellermann Committed by Christian Brauner
Browse files

fs/netfs: remove unused flag NETFS_RREQ_BLOCKED 



NETFS_RREQ_BLOCKED was added by commit 016dc851 ("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: default avatarMax Kellermann <max.kellermann@ionos.com>
Signed-off-by: default avatarDavid 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: default avatarChristian Brauner <brauner@kernel.org>
parent 67b91671

fs/netfs/direct_read.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

fs/netfs/objects.c

+0 −2
Original line number Diff line number Diff line
@@ -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) {

include/linux/netfs.h

+0 −2
Original line number Diff line number Diff line
@@ -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 */