From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 15/22] fs: Remove aop_flags parameter from netfs_write_begin()
Date: Tue, 22 Feb 2022 19:48:13 +0000 [thread overview]
Message-ID: <20220222194820.737755-16-willy@infradead.org> (raw)
In-Reply-To: <20220222194820.737755-1-willy@infradead.org>
There are no more aop flags left, so remove the parameter.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
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
next prev parent reply other threads:[~2022-02-22 19:48 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 19:47 [PATCH 00/22] Remove aop flags Matthew Wilcox (Oracle)
2022-02-22 19:47 ` [PATCH 01/22] fs: Pass an iocb to generic_perform_write() Matthew Wilcox (Oracle)
2022-02-23 6:51 ` Christoph Hellwig
2022-03-02 17:36 ` Matthew Wilcox
2022-02-23 8:47 ` Christian Brauner
2022-02-22 19:48 ` [PATCH 02/22] fs: Move pagecache_write_begin() and pagecache_write_end() Matthew Wilcox (Oracle)
2022-02-23 6:53 ` Christoph Hellwig
2022-02-23 8:47 ` Christian Brauner
2022-02-22 19:48 ` [PATCH 03/22] reiserfs: Stop using AOP_FLAG_CONT_EXPAND flag Matthew Wilcox (Oracle)
2022-02-23 6:54 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 04/22] filemap: Remove AOP_FLAG_CONT_EXPAND Matthew Wilcox (Oracle)
2022-02-23 6:54 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 05/22] ext4: Use page_symlink() instead of __page_symlink() Matthew Wilcox (Oracle)
2022-02-23 6:54 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 06/22] namei: Merge page_symlink() and __page_symlink() Matthew Wilcox (Oracle)
2022-02-23 6:55 ` Christoph Hellwig
2022-02-23 8:48 ` Christian Brauner
2022-02-22 19:48 ` [PATCH 07/22] namei: Convert page_symlink() to use memalloc_nofs_save() Matthew Wilcox (Oracle)
2022-02-23 6:56 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 08/22] f2fs: Convert f2fs_grab_cache_page() to use scoped memory APIs Matthew Wilcox (Oracle)
2022-02-23 6:57 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 09/22] ext4: Allow GFP_FS allocations in ext4_da_convert_inline_data_to_extent() Matthew Wilcox (Oracle)
2022-03-08 17:12 ` Theodore Ts'o
2022-02-22 19:48 ` [PATCH 10/22] ext4: Use scoped memory API in mext_page_double_lock() Matthew Wilcox (Oracle)
2022-03-08 17:13 ` Theodore Ts'o
2022-02-22 19:48 ` [PATCH 11/22] ext4: Use scoped memory APIs in ext4_da_write_begin() Matthew Wilcox (Oracle)
2022-03-08 17:13 ` Theodore Ts'o
2022-02-22 19:48 ` [PATCH 12/22] ext4: Use scoped memory APIs in ext4_write_begin() Matthew Wilcox (Oracle)
2022-03-08 15:55 ` Theodore Ts'o
2022-02-22 19:48 ` [PATCH 13/22] fs: Remove AOP_FLAG_NOFS Matthew Wilcox (Oracle)
2022-02-23 6:57 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 14/22] fs: Remove aop flags argument from pagecache_write_begin() Matthew Wilcox (Oracle)
2022-02-23 6:57 ` Christoph Hellwig
2022-02-22 19:48 ` Matthew Wilcox (Oracle) [this message]
2022-02-23 6:57 ` [PATCH 15/22] fs: Remove aop_flags parameter from netfs_write_begin() Christoph Hellwig
2022-02-22 19:48 ` [PATCH 16/22] fs: Remove aop flags parameter from block_write_begin() Matthew Wilcox (Oracle)
2022-02-23 6:58 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 17/22] fs: Remove aop flags parameter from cont_write_begin() Matthew Wilcox (Oracle)
2022-02-23 6:59 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 18/22] fs: Remove aop flags parameter from grab_cache_page_write_begin() Matthew Wilcox (Oracle)
2022-02-23 6:59 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 19/22] affs: Use pagecache_write_begin() & pagecache_write_end() Matthew Wilcox (Oracle)
2022-02-23 7:05 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 20/22] f2fs: " Matthew Wilcox (Oracle)
2022-02-22 19:48 ` [PATCH 21/22] fs: Remove aop flags parameter from nobh_write_begin() Matthew Wilcox (Oracle)
2022-02-23 7:05 ` Christoph Hellwig
2022-02-22 19:48 ` [PATCH 22/22] fs: Remove flags parameter from aops->write_begin Matthew Wilcox (Oracle)
2022-02-23 7:06 ` Christoph Hellwig
2022-02-22 22:24 ` [PATCH 00/22] Remove aop flags Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220222194820.737755-16-willy@infradead.org \
--to=willy@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).