From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 18/22] fs: Remove aop flags parameter from grab_cache_page_write_begin()
Date: Tue, 22 Feb 2022 19:48:16 +0000 [thread overview]
Message-ID: <20220222194820.737755-19-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>
---
fs/affs/file.c | 2 +-
fs/buffer.c | 4 ++--
fs/cifs/file.c | 2 +-
fs/ecryptfs/mmap.c | 2 +-
fs/ext4/inline.c | 8 ++++----
fs/ext4/inode.c | 4 ++--
fs/ext4/move_extent.c | 4 ++--
fs/f2fs/f2fs.h | 2 +-
fs/fuse/file.c | 4 ++--
fs/hostfs/hostfs_kern.c | 2 +-
fs/jffs2/file.c | 2 +-
fs/libfs.c | 2 +-
fs/nfs/file.c | 2 +-
fs/ntfs3/inode.c | 2 +-
fs/orangefs/inode.c | 2 +-
fs/reiserfs/inode.c | 2 +-
fs/ubifs/file.c | 4 ++--
fs/udf/file.c | 2 +-
include/linux/pagemap.h | 2 +-
mm/folio-compat.c | 2 +-
20 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 704911d6aeba..06645d05c717 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -670,7 +670,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
}
index = pos >> PAGE_SHIFT;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/fs/buffer.c b/fs/buffer.c
index 115a1184a0bf..2b3518d57bcc 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2110,7 +2110,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
struct page *page;
int status;
- page = grab_cache_page_write_begin(mapping, index, 0);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
@@ -2591,7 +2591,7 @@ int nobh_write_begin(struct address_space *mapping,
from = pos & (PAGE_SIZE - 1);
to = from + len;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 8a2e9025bdb3..3816c7f1bc98 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -4679,7 +4679,7 @@ static int cifs_write_begin(struct file *file, struct address_space *mapping,
cifs_dbg(FYI, "write_begin from %lld len %d\n", (long long)pos, len);
start:
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page) {
rc = -ENOMEM;
goto out;
diff --git a/fs/ecryptfs/mmap.c b/fs/ecryptfs/mmap.c
index 9ad61b582f07..84e399a921ad 100644
--- a/fs/ecryptfs/mmap.c
+++ b/fs/ecryptfs/mmap.c
@@ -272,7 +272,7 @@ static int ecryptfs_write_begin(struct file *file,
loff_t prev_page_end_size;
int rc = 0;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c
index eae94228a143..4d04e0af00a7 100644
--- a/fs/ext4/inline.c
+++ b/fs/ext4/inline.c
@@ -563,7 +563,7 @@ static int ext4_convert_inline_data_to_extent(struct address_space *mapping,
/* We cannot recurse into the filesystem as the transaction is already
* started */
flags = memalloc_nofs_save();
- page = grab_cache_page_write_begin(mapping, 0, 0);
+ page = grab_cache_page_write_begin(mapping, 0);
memalloc_nofs_restore(flags);
if (!page) {
ret = -ENOMEM;
@@ -692,7 +692,7 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
goto out;
flags = memalloc_nofs_save();
- page = grab_cache_page_write_begin(mapping, 0, 0);
+ page = grab_cache_page_write_begin(mapping, 0);
memalloc_nofs_restore(flags);
if (!page) {
ret = -ENOMEM;
@@ -852,7 +852,7 @@ static int ext4_da_convert_inline_data_to_extent(struct address_space *mapping,
int ret = 0, inline_size;
struct page *page;
- page = grab_cache_page_write_begin(mapping, 0, 0);
+ page = grab_cache_page_write_begin(mapping, 0);
if (!page)
return -ENOMEM;
@@ -946,7 +946,7 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
* is already started.
*/
flags = memalloc_nofs_save();
- page = grab_cache_page_write_begin(mapping, 0, 0);
+ page = grab_cache_page_write_begin(mapping, 0);
memalloc_nofs_restore(flags);
if (!page) {
ret = -ENOMEM;
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index c203183859c9..11e3c2d6bcd2 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1171,7 +1171,7 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
* the page (if needed) without using GFP_NOFS.
*/
retry_grab:
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
unlock_page(page);
@@ -2938,7 +2938,7 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
}
retry:
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
diff --git a/fs/ext4/move_extent.c b/fs/ext4/move_extent.c
index 56f21272fb00..4172a7d22471 100644
--- a/fs/ext4/move_extent.c
+++ b/fs/ext4/move_extent.c
@@ -141,13 +141,13 @@ mext_page_double_lock(struct inode *inode1, struct inode *inode2,
}
flags = memalloc_nofs_save();
- page[0] = grab_cache_page_write_begin(mapping[0], index1, 0);
+ page[0] = grab_cache_page_write_begin(mapping[0], index1);
if (!page[0]) {
memalloc_nofs_restore(flags);
return -ENOMEM;
}
- page[1] = grab_cache_page_write_begin(mapping[1], index2, 0);
+ page[1] = grab_cache_page_write_begin(mapping[1], index2);
memalloc_nofs_restore(flags);
if (!page[1]) {
unlock_page(page[0]);
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 324553da3bdd..68bf0978b0a6 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2580,7 +2580,7 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping,
return grab_cache_page(mapping, index);
flags = memalloc_nofs_save();
- page = grab_cache_page_write_begin(mapping, index, 0);
+ page = grab_cache_page_write_begin(mapping, index);
memalloc_nofs_restore(flags);
return page;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 48062c2506bd..968941d41162 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1166,7 +1166,7 @@ static ssize_t fuse_fill_write_pages(struct fuse_io_args *ia,
break;
err = -ENOMEM;
- page = grab_cache_page_write_begin(mapping, index, 0);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
break;
@@ -2266,7 +2266,7 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping,
WARN_ON(!fc->writeback_cache);
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
goto error;
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 27f4c2eb1705..7075a29a7c0c 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -468,7 +468,7 @@ static int hostfs_write_begin(struct file *file, struct address_space *mapping,
{
pgoff_t index = pos >> PAGE_SHIFT;
- *pagep = grab_cache_page_write_begin(mapping, index, flags);
+ *pagep = grab_cache_page_write_begin(mapping, index);
if (!*pagep)
return -ENOMEM;
return 0;
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index bd7d58d27bfc..142d3ba9f0a8 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -213,7 +213,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
* page in read_cache_page(), which causes a deadlock.
*/
mutex_lock(&c->alloc_sem);
- pg = grab_cache_page_write_begin(mapping, index, flags);
+ pg = grab_cache_page_write_begin(mapping, index);
if (!pg) {
ret = -ENOMEM;
goto release_sem;
diff --git a/fs/libfs.c b/fs/libfs.c
index e64bdedef168..d4395e1c6696 100644
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -557,7 +557,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping,
index = pos >> PAGE_SHIFT;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index 68ec0c9579d9..12bf12da7657 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -330,7 +330,7 @@ static int nfs_write_begin(struct file *file, struct address_space *mapping,
file, mapping->host->i_ino, len, (long long) pos);
start:
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 3914138fd8ba..16466c8648f3 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -872,7 +872,7 @@ static int ntfs_write_begin(struct file *file, struct address_space *mapping,
*pagep = NULL;
if (is_resident(ni)) {
struct page *page = grab_cache_page_write_begin(
- mapping, pos >> PAGE_SHIFT, flags);
+ mapping, pos >> PAGE_SHIFT);
if (!page) {
err = -ENOMEM;
diff --git a/fs/orangefs/inode.c b/fs/orangefs/inode.c
index 79c1025d18ea..809690db8be2 100644
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -338,7 +338,7 @@ static int orangefs_write_begin(struct file *file,
index = pos >> PAGE_SHIFT;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
index 36c59b25486c..aa31cf1dbba6 100644
--- a/fs/reiserfs/inode.c
+++ b/fs/reiserfs/inode.c
@@ -2764,7 +2764,7 @@ static int reiserfs_write_begin(struct file *file,
inode = mapping->host;
index = pos >> PAGE_SHIFT;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 8a9ffc2d4167..191490fdf91b 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -244,7 +244,7 @@ static int write_begin_slow(struct address_space *mapping,
if (unlikely(err))
return err;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (unlikely(!page)) {
ubifs_release_budget(c, &req);
return -ENOMEM;
@@ -437,7 +437,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
return -EROFS;
/* Try out the fast-path part first */
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index);
if (unlikely(!page))
return -ENOMEM;
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 0f6bf2504437..724bb3141fda 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -94,7 +94,7 @@ static int udf_adinicb_write_begin(struct file *file,
if (WARN_ON_ONCE(pos >= PAGE_SIZE))
return -EIO;
- page = grab_cache_page_write_begin(mapping, 0, flags);
+ page = grab_cache_page_write_begin(mapping, 0);
if (!page)
return -ENOMEM;
*pagep = page;
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index 2e0a82a01564..e7d9cf94e0f0 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -653,7 +653,7 @@ static inline unsigned find_get_pages_tag(struct address_space *mapping,
}
struct page *grab_cache_page_write_begin(struct address_space *mapping,
- pgoff_t index, unsigned flags);
+ pgoff_t index);
/*
* Returns locked page at given index in given cache, creating it if needed.
diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index 540c4949e9a1..599e4743d79f 100644
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -130,7 +130,7 @@ struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,
EXPORT_SYMBOL(pagecache_get_page);
struct page *grab_cache_page_write_begin(struct address_space *mapping,
- pgoff_t index, unsigned flags)
+ pgoff_t index)
{
unsigned fgp_flags = FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE;
--
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 ` [PATCH 15/22] fs: Remove aop_flags parameter from netfs_write_begin() Matthew Wilcox (Oracle)
2022-02-23 6:57 ` 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 ` Matthew Wilcox (Oracle) [this message]
2022-02-23 6:59 ` [PATCH 18/22] fs: Remove aop flags parameter from grab_cache_page_write_begin() 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-19-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).