There are no more aop flags left, so remove the parameter.
Signed-off-by: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
---
Documentation/filesystems/netfs_library.rst | 1 -
fs/9p/vfs_addr.c | 2 +-
fs/afs/write.c | 2 +-
fs/ceph/addr.c | 2 +-
fs/netfs/read_helper.c | 6 ++----
include/linux/netfs.h | 2 +-
6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/Documentation/filesystems/netfs_library.rst b/Documentation/filesystems/netfs_library.rst
index 4f373a8ec47b..9e0390c9e679 100644
--- a/Documentation/filesystems/netfs_library.rst
+++ b/Documentation/filesystems/netfs_library.rst
@@ -81,7 +81,6 @@ Three read helpers are provided::
struct address_space *mapping,
loff_t pos,
unsigned int len,
- unsigned int flags,
struct folio **_folio,
void **_fsdata,
const struct netfs_read_request_ops *ops,
diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
index 76956c9d2af9..0eece6974a3f 100644
--- a/fs/9p/vfs_addr.c
+++ b/fs/9p/vfs_addr.c
@@ -308,7 +308,7 @@ static int v9fs_write_begin(struct file *filp, struct address_space *mapping,
* file. We need to do this before we get a lock on the page in case
* there's more than one writer competing for the same cache block.
*/
- retval = netfs_write_begin(filp, mapping, pos, len, flags, &folio, fsdata,
+ retval = netfs_write_begin(filp, mapping, pos, len, &folio, fsdata,
&v9fs_req_ops, NULL);
if (retval < 0)
return retval;
diff --git a/fs/afs/write.c b/fs/afs/write.c
index 88861613734e..986e97866e16 100644
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@ -60,7 +60,7 @@ int afs_write_begin(struct file *file, struct address_space *mapping,
* file. We need to do this before we get a lock on the page in case
* there's more than one writer competing for the same cache block.
*/
- ret = netfs_write_begin(file, mapping, pos, len, flags, &folio, fsdata,
+ ret = netfs_write_begin(file, mapping, pos, len, &folio, fsdata,
&afs_req_ops, NULL);
if (ret < 0)
return ret;
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index 3a2b98efebf5..09f27d1d7fec 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1311,7 +1311,7 @@ static int ceph_write_begin(struct file *file, struct address_space *mapping,
goto out;
}
- r = netfs_write_begin(file, inode->i_mapping, pos, len, 0, &folio, NULL,
+ r = netfs_write_begin(file, inode->i_mapping, pos, len, &folio, NULL,
&ceph_netfs_read_ops, NULL);
out:
if (r == 0)
diff --git a/fs/netfs/read_helper.c b/fs/netfs/read_helper.c
index de0dfb37746b..439e83dc2a02 100644
--- a/fs/netfs/read_helper.c
+++ b/fs/netfs/read_helper.c
@@ -1048,7 +1048,6 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)
* @mapping: The mapping to read from
* @pos: File position at which the write will begin
* @len: The length of the write (may extend beyond the end of the folio chosen)
- * @aop_flags: AOP_* flags
* @_folio: Where to put the resultant folio
* @_fsdata: Place for the netfs to store a cookie
* @ops: The network filesystem's operations for the helper to use
@@ -1074,9 +1073,8 @@ static bool netfs_skip_folio_read(struct folio *folio, loff_t pos, size_t len)
* This is usable whether or not caching is enabled.
*/
int netfs_write_begin(struct file *file, struct address_space *mapping,
- loff_t pos, unsigned int len, unsigned int aop_flags,
- struct folio **_folio, void **_fsdata,
- const struct netfs_read_request_ops *ops,
+ loff_t pos, unsigned int len, struct folio **_folio,
+ void **_fsdata, const struct netfs_read_request_ops *ops,
void *netfs_priv)
{
struct netfs_read_request *rreq;
diff --git a/include/linux/netfs.h b/include/linux/netfs.h
index 614f22213e21..8e10aef2565d 100644
--- a/include/linux/netfs.h
+++ b/include/linux/netfs.h
@@ -262,7 +262,7 @@ extern int netfs_readpage(struct file *,
const struct netfs_read_request_ops *,
void *);
extern int netfs_write_begin(struct file *, struct address_space *,
- loff_t, unsigned int, unsigned int, struct folio **,
+ loff_t, unsigned int, struct folio **,
void **,
const struct netfs_read_request_ops *,
void *);
--
2.34.1
