Commit f18a3785 authored by David Howells's avatar David Howells
Browse files

netfs: Finish off rename of netfs_read_request to netfs_io_request 



Adjust helper function names and comments after mass rename of
struct netfs_read_*request to struct netfs_io_*request.

Changes
=======
ver #2)
 - Make the changes in the docs also.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
cc: linux-cachefs@redhat.com

Link: https://lore.kernel.org/r/164622992433.3564931.6684311087845150271.stgit@warthog.procyon.org.uk/ # v1
Link: https://lore.kernel.org/r/164678196111.1200972.5001114956865989528.stgit@warthog.procyon.org.uk/ # v2
Link: https://lore.kernel.org/r/164692892567.2099075.13895804222087028813.stgit@warthog.procyon.org.uk/ # v3
parent 6a19114b

Documentation/filesystems/netfs_library.rst

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ through which it can issue requests and negotiate:: 
		int (*begin_cache_operation)(struct netfs_io_request *rreq);

		void (*expand_readahead)(struct netfs_io_request *rreq);

		bool (*clamp_length)(struct netfs_io_subrequest *subreq);

		void (*issue_op)(struct netfs_io_subrequest *subreq);

		void (*issue_read)(struct netfs_io_subrequest *subreq);

		bool (*is_still_valid)(struct netfs_io_request *rreq);

		int (*check_write_begin)(struct file *file, loff_t pos, unsigned len,

					 struct folio *folio, void **_fsdata);
@@ -305,7 +305,7 @@ The operations are as follows: 


   This should return 0 on success and an error code on error.



 * ``issue_op()``

 * ``issue_read()``



   [Required] The helpers use this to dispatch a subrequest to the server for

   reading.  In the subrequest, ->start, ->len and ->transferred indicate what

fs/9p/vfs_addr.c

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include "fid.h"



/**

 * v9fs_req_issue_op - Issue a read from 9P

 * v9fs_issue_read - Issue a read from 9P

 * @subreq: The read to make

 */

static void v9fs_req_issue_op(struct netfs_io_subrequest *subreq)

static void v9fs_issue_read(struct netfs_io_subrequest *subreq)

{

	struct netfs_io_request *rreq = subreq->rreq;

	struct p9_fid *fid = rreq->netfs_priv;
@@ -106,7 +106,7 @@ static const struct netfs_request_ops v9fs_req_ops = { 
	.init_request		= v9fs_init_request,

	.is_cache_enabled	= v9fs_is_cache_enabled,

	.begin_cache_operation	= v9fs_begin_cache_operation,

	.issue_op		= v9fs_req_issue_op,

	.issue_read		= v9fs_issue_read,

	.cleanup		= v9fs_req_cleanup,

};

fs/afs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ int afs_fetch_data(struct afs_vnode *vnode, struct afs_read *req) 
	return afs_do_sync_operation(op);

}



static void afs_req_issue_op(struct netfs_io_subrequest *subreq)

static void afs_issue_read(struct netfs_io_subrequest *subreq)

{

	struct afs_vnode *vnode = AFS_FS_I(subreq->rreq->inode);

	struct afs_read *fsreq;
@@ -401,7 +401,7 @@ const struct netfs_request_ops afs_req_ops = { 
	.is_cache_enabled	= afs_is_cache_enabled,

	.begin_cache_operation	= afs_begin_cache_operation,

	.check_write_begin	= afs_check_write_begin,

	.issue_op		= afs_req_issue_op,

	.issue_read		= afs_issue_read,

	.cleanup		= afs_priv_cleanup,

};

fs/cachefiles/io.c

+2 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest * 
	}



	if (test_bit(FSCACHE_COOKIE_NO_DATA_TO_READ, &cookie->flags)) {

		__set_bit(NETFS_SREQ_WRITE_TO_CACHE, &subreq->flags);

		__set_bit(NETFS_SREQ_COPY_TO_CACHE, &subreq->flags);

		why = cachefiles_trace_read_no_data;

		goto out_no_object;

	}
@@ -475,7 +475,7 @@ static enum netfs_io_source cachefiles_prepare_read(struct netfs_io_subrequest * 
	goto out;



download_and_store:

	__set_bit(NETFS_SREQ_WRITE_TO_CACHE, &subreq->flags);

	__set_bit(NETFS_SREQ_COPY_TO_CACHE, &subreq->flags);

out:

	cachefiles_end_secure(cache, saved_cred);

out_no_object:

fs/ceph/addr.c

+3 −3
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq) 
	size_t len;



	__set_bit(NETFS_SREQ_CLEAR_TAIL, &subreq->flags);

	__clear_bit(NETFS_SREQ_WRITE_TO_CACHE, &subreq->flags);

	__clear_bit(NETFS_SREQ_COPY_TO_CACHE, &subreq->flags);



	if (subreq->start >= inode->i_size)

		goto out;
@@ -298,7 +298,7 @@ static bool ceph_netfs_issue_op_inline(struct netfs_io_subrequest *subreq) 
	return true;

}



static void ceph_netfs_issue_op(struct netfs_io_subrequest *subreq)

static void ceph_netfs_issue_read(struct netfs_io_subrequest *subreq)

{

	struct netfs_io_request *rreq = subreq->rreq;

	struct inode *inode = rreq->inode;
@@ -367,7 +367,7 @@ static void ceph_readahead_cleanup(struct address_space *mapping, void *priv) 
static const struct netfs_request_ops ceph_netfs_read_ops = {

	.is_cache_enabled	= ceph_is_cache_enabled,

	.begin_cache_operation	= ceph_begin_cache_operation,

	.issue_op		= ceph_netfs_issue_op,

	.issue_read		= ceph_netfs_issue_read,

	.expand_readahead	= ceph_netfs_expand_readahead,

	.clamp_length		= ceph_netfs_clamp_length,

	.check_write_begin	= ceph_netfs_check_write_begin,