Merge tag 'vfs-6.10.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

[linux-2.6-block.git] / fs / afs / file.c

diff --git a/fs/afs/file.c b/fs/afs/file.c
index ef2cc8f565d25b15e086d2fc64c6f565bac7a16b..c3f0c45ae9a9b6f6582accd6e9365862808fb7e1 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -54,7 +54,6 @@ const struct address_space_operations afs_file_aops = {
        .read_folio     = netfs_read_folio,
        .readahead      = netfs_readahead,
        .dirty_folio    = netfs_dirty_folio,
-       .launder_folio  = netfs_launder_folio,
        .release_folio  = netfs_release_folio,
        .invalidate_folio = netfs_invalidate_folio,
        .migrate_folio  = filemap_migrate_folio,
@@ -354,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;
 }
 
@@ -369,6 +368,7 @@ static int afs_check_write_begin(struct file *file, loff_t pos, unsigned len,
 static void afs_free_request(struct netfs_io_request *rreq)
 {
        key_put(rreq->netfs_priv);
+       afs_put_wb_key(rreq->netfs_priv2);
 }
 
 static void afs_update_i_size(struct inode *inode, loff_t new_i_size)
@@ -400,7 +400,9 @@ 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,
 };
 
 static void afs_add_open_mmap(struct afs_vnode *vnode)