From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: linux-fsdevel@vger.kernel.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Subject: [PATCH 16/22] fs: Remove aop flags parameter from block_write_begin()
Date: Tue, 22 Feb 2022 19:48:14 +0000 [thread overview]
Message-ID: <20220222194820.737755-17-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>
---
block/fops.c | 3 +--
fs/bfs/file.c | 3 +--
fs/buffer.c | 6 +++---
fs/ext2/inode.c | 3 +--
fs/minix/inode.c | 3 +--
fs/nilfs2/inode.c | 3 +--
fs/nilfs2/recovery.c | 2 +-
fs/ntfs3/inode.c | 4 ++--
fs/omfs/file.c | 3 +--
fs/sysv/itree.c | 2 +-
fs/udf/inode.c | 2 +-
fs/ufs/inode.c | 3 +--
include/linux/buffer_head.h | 2 +-
13 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/block/fops.c b/block/fops.c
index 796a78fd1583..6a2c84555dbb 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -405,8 +405,7 @@ static int blkdev_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, unsigned flags, struct page **pagep,
void **fsdata)
{
- return block_write_begin(mapping, pos, len, flags, pagep,
- blkdev_get_block);
+ return block_write_begin(mapping, pos, len, pagep, blkdev_get_block);
}
static int blkdev_write_end(struct file *file, struct address_space *mapping,
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 03139344568f..9408f45225cb 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -174,8 +174,7 @@ static int bfs_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep,
- bfs_get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, bfs_get_block);
if (unlikely(ret))
bfs_write_failed(mapping, pos + len);
diff --git a/fs/buffer.c b/fs/buffer.c
index 440979592c05..b5b83e5159bf 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2104,13 +2104,13 @@ static int __block_commit_write(struct inode *inode, struct page *page,
* The filesystem needs to handle block truncation upon failure.
*/
int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
- unsigned flags, struct page **pagep, get_block_t *get_block)
+ struct page **pagep, get_block_t *get_block)
{
pgoff_t index = pos >> PAGE_SHIFT;
struct page *page;
int status;
- page = grab_cache_page_write_begin(mapping, index, flags);
+ page = grab_cache_page_write_begin(mapping, index, 0);
if (!page)
return -ENOMEM;
@@ -2460,7 +2460,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
(*bytes)++;
}
- return block_write_begin(mapping, pos, len, flags, pagep, get_block);
+ return block_write_begin(mapping, pos, len, pagep, get_block);
}
EXPORT_SYMBOL(cont_write_begin);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 52377a0ee735..97192932ea56 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -892,8 +892,7 @@ ext2_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep,
- ext2_get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, ext2_get_block);
if (ret < 0)
ext2_write_failed(mapping, pos + len);
return ret;
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 1e41fba68dcf..2fac50b3a334 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -428,8 +428,7 @@ static int minix_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep,
- minix_get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, minix_get_block);
if (unlikely(ret))
minix_write_failed(mapping, pos + len);
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c
index c1219c0678a5..96f5d8334621 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -255,8 +255,7 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping,
if (unlikely(err))
return err;
- err = block_write_begin(mapping, pos, len, flags, pagep,
- nilfs_get_block);
+ err = block_write_begin(mapping, pos, len, pagep, nilfs_get_block);
if (unlikely(err)) {
nilfs_write_failed(mapping, pos + len);
nilfs_transaction_abort(inode->i_sb);
diff --git a/fs/nilfs2/recovery.c b/fs/nilfs2/recovery.c
index 9e2ed76c0f25..0955b657938f 100644
--- a/fs/nilfs2/recovery.c
+++ b/fs/nilfs2/recovery.c
@@ -511,7 +511,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,
pos = rb->blkoff << inode->i_blkbits;
err = block_write_begin(inode->i_mapping, pos, blocksize,
- 0, &page, nilfs_get_block);
+ &page, nilfs_get_block);
if (unlikely(err)) {
loff_t isize = inode->i_size;
diff --git a/fs/ntfs3/inode.c b/fs/ntfs3/inode.c
index 9eab11e3b034..3914138fd8ba 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -894,7 +894,7 @@ static int ntfs_write_begin(struct file *file, struct address_space *mapping,
goto out;
}
- err = block_write_begin(mapping, pos, len, flags, pagep,
+ err = block_write_begin(mapping, pos, len, pagep,
ntfs_get_block_write_begin);
out:
@@ -975,7 +975,7 @@ int reset_log_file(struct inode *inode)
len = pos + PAGE_SIZE > log_size ? (log_size - pos) : PAGE_SIZE;
- err = block_write_begin(mapping, pos, len, 0, &page,
+ err = block_write_begin(mapping, pos, len, &page,
ntfs_get_block_write_begin);
if (err)
goto out;
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 3f297b541713..349b96d89c44 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -321,8 +321,7 @@ static int omfs_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep,
- omfs_get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, omfs_get_block);
if (unlikely(ret))
omfs_write_failed(mapping, pos + len);
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c
index 409ab5e17803..96b7fd4facf3 100644
--- a/fs/sysv/itree.c
+++ b/fs/sysv/itree.c
@@ -482,7 +482,7 @@ static int sysv_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep, get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, get_block);
if (unlikely(ret))
sysv_write_failed(mapping, pos + len);
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index ca4fa710e562..88a95886ce8a 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -209,7 +209,7 @@ static int udf_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep, udf_get_block);
+ ret = block_write_begin(mapping, pos, len, pagep, udf_get_block);
if (unlikely(ret))
udf_write_failed(mapping, pos + len);
return ret;
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index d0dda01620f0..bd0e0c66f93d 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -500,8 +500,7 @@ static int ufs_write_begin(struct file *file, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, flags, pagep,
- ufs_getfrag_block);
+ ret = block_write_begin(mapping, pos, len, pagep, ufs_getfrag_block);
if (unlikely(ret))
ufs_write_failed(mapping, pos + len);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index bcb4fe9b8575..63e49dfa7738 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -226,7 +226,7 @@ int __block_write_full_page(struct inode *inode, struct page *page,
int block_read_full_page(struct page*, get_block_t*);
bool block_is_partially_uptodate(struct folio *, size_t from, size_t count);
int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
- unsigned flags, struct page **pagep, get_block_t *get_block);
+ struct page **pagep, get_block_t *get_block);
int __block_write_begin(struct page *page, loff_t pos, unsigned len,
get_block_t *get_block);
int block_write_end(struct file *, struct address_space *,
--
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 ` Matthew Wilcox (Oracle) [this message]
2022-02-23 6:58 ` [PATCH 16/22] fs: Remove aop flags parameter from block_write_begin() 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-17-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).