Commit 2df86547 authored by David Howells's avatar David Howells
Browse files

netfs: Cut over to using new writeback code 



Cut over to using the new writeback code.  The old code is #ifdef'd out or
otherwise removed from compilation to avoid conflicts and will be removed
in a future patch.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
cc: Eric Van Hensbergen <ericvh@kernel.org>
cc: Latchesar Ionkov <lucho@ionkov.net>
cc: Dominique Martinet <asmadeus@codewreck.org>
cc: Christian Schoenebeck <linux_oss@crudebyte.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: v9fs@lists.linux.dev
cc: linux-afs@lists.infradead.org
cc: netfs@lists.linux.dev
cc: linux-fsdevel@vger.kernel.org
parent 64e64e6c

fs/9p/vfs_addr.c

+2 −4
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ static void v9fs_issue_write(struct netfs_io_subrequest *subreq) 
	netfs_write_subrequest_terminated(subreq, len ?: err, false);

}



#if 0 // TODO: Remove

static void v9fs_upload_to_server(struct netfs_io_subrequest *subreq)

{

	struct p9_fid *fid = subreq->rreq->netfs_priv;
@@ -91,6 +92,7 @@ static void v9fs_create_write_requests(struct netfs_io_request *wreq, loff_t sta 
	if (subreq)

		netfs_queue_write_request(subreq);

}

#endif



/**

 * v9fs_issue_read - Issue a read from 9P
@@ -121,18 +123,15 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) 
{

	struct p9_fid *fid;

	bool writing = (rreq->origin == NETFS_READ_FOR_WRITE ||

			rreq->origin == NETFS_WRITEBACK ||

			rreq->origin == NETFS_WRITETHROUGH ||

			rreq->origin == NETFS_UNBUFFERED_WRITE ||

			rreq->origin == NETFS_DIO_WRITE);



#if 0 // TODO: Cut over

	if (rreq->origin == NETFS_WRITEBACK)

		return 0; /* We don't get the write handle until we find we

			   * have actually dirty data and not just

			   * copy-to-cache data.

			   */

#endif



	if (file) {

		fid = file->private_data;
@@ -179,7 +178,6 @@ const struct netfs_request_ops v9fs_req_ops = { 
	.issue_read		= v9fs_issue_read,

	.begin_writeback	= v9fs_begin_writeback,

	.issue_write		= v9fs_issue_write,

	.create_write_requests	= v9fs_create_write_requests,

};



const struct address_space_operations v9fs_addr_operations = {

fs/afs/file.c

+1 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ static int afs_init_request(struct netfs_io_request *rreq, struct file *file) 
	if (file)

		rreq->netfs_priv = key_get(afs_file_key(file));

	rreq->rsize = 256 * 1024;

	rreq->wsize = 256 * 1024;

	rreq->wsize = 256 * 1024 * 1024;

	return 0;

}
@@ -399,7 +399,6 @@ const struct netfs_request_ops afs_req_ops = { 
	.issue_read		= afs_issue_read,

	.update_i_size		= afs_update_i_size,

	.invalidate_cache	= afs_netfs_invalidate_cache,

	.create_write_requests	= afs_create_write_requests,

	.begin_writeback	= afs_begin_writeback,

	.prepare_write		= afs_prepare_write,

	.issue_write		= afs_issue_write,

fs/afs/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -1605,7 +1605,6 @@ extern int afs_writepages(struct address_space *, struct writeback_control *); 
extern int afs_fsync(struct file *, loff_t, loff_t, int);

extern vm_fault_t afs_page_mkwrite(struct vm_fault *vmf);

extern void afs_prune_wb_keys(struct afs_vnode *);

void afs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size_t len);



/*

 * xattr.c

fs/afs/write.c

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static int afs_store_data(struct afs_vnode *vnode, struct iov_iter *iter, loff_t 
	return afs_put_operation(op);

}



#if 0 // TODO: Remove

static void afs_upload_to_server(struct netfs_io_subrequest *subreq)

{

	struct afs_vnode *vnode = AFS_FS_I(subreq->rreq->inode);
@@ -193,6 +194,7 @@ void afs_create_write_requests(struct netfs_io_request *wreq, loff_t start, size 
	if (subreq)

		netfs_queue_write_request(subreq);

}

#endif



/*

 * Writeback calls this when it finds a folio that needs uploading.  This isn't

fs/netfs/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ netfs-y := \ 
	main.o \

	misc.o \

	objects.o \

	output.o \

	write_collect.o \

	write_issue.o