| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20250626173023.2702554-2-frank.li@vivo.com>
Date: Thu, 26 Jun 2025 11:30:20 -0600
From: Yangtao Li <frank.li@...o.com>
To: axboe@...nel.dk,
aivazian.tigran@...il.com,
viro@...iv.linux.org.uk,
brauner@...nel.org,
jack@...e.cz,
linkinjeon@...nel.org,
sj1557.seo@...sung.com,
yuezhang.mo@...y.com,
slava@...eyko.com,
glaubitz@...sik.fu-berlin.de,
frank.li@...o.com,
shaggy@...nel.org,
konishi.ryusuke@...il.com,
almaz.alexandrovich@...agon-software.com,
me@...copeland.com,
willy@...radead.org,
josef@...icpanda.com,
kovalev@...linux.org,
dave@...olabs.net,
mhocko@...e.com,
chentaotao@...iglobal.com
Cc: linux-block@...r.kernel.org,
linux-kernel@...r.kernel.org,
linux-fsdevel@...r.kernel.org,
linux-ext4@...r.kernel.org,
jfs-discussion@...ts.sourceforge.net,
linux-nilfs@...r.kernel.org,
ntfs3@...ts.linux.dev,
linux-karma-devel@...ts.sourceforge.net,
bpf@...r.kernel.org
Subject: [PATCH 1/4] block: Add struct kiocb pointer to block_write_begin()
Refactoring block_write_begin to use struct kiocb for passing write context and
flags.
Signed-off-by: Yangtao Li <frank.li@...o.com>
---
block/fops.c | 2 +-
fs/bfs/file.c | 2 +-
fs/buffer.c | 6 +++---
fs/exfat/inode.c | 3 +--
fs/ext2/inode.c | 2 +-
fs/jfs/inode.c | 2 +-
fs/minix/inode.c | 2 +-
fs/nilfs2/inode.c | 2 +-
fs/nilfs2/recovery.c | 2 +-
fs/ntfs3/inode.c | 2 +-
fs/omfs/file.c | 2 +-
fs/udf/inode.c | 2 +-
fs/ufs/inode.c | 2 +-
include/linux/buffer_head.h | 4 ++--
14 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/block/fops.c b/block/fops.c
index 25ebee01e647..52ab6b5ba794 100644
--- a/block/fops.c
+++ b/block/fops.c
@@ -499,7 +499,7 @@ static void blkdev_readahead(struct readahead_control *rac)
static int blkdev_write_begin(struct kiocb *iocb, struct address_space *mapping,
loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{
- return block_write_begin(mapping, pos, len, foliop, blkdev_get_block);
+ return block_write_begin(iocb, mapping, pos, len, foliop, blkdev_get_block);
}
static int blkdev_write_end(struct kiocb *iocb, struct address_space *mapping,
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 0a8ae8c2346b..860613c876ef 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -176,7 +176,7 @@ static int bfs_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, bfs_get_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, bfs_get_block);
if (unlikely(ret))
bfs_write_failed(mapping, pos + len);
diff --git a/fs/buffer.c b/fs/buffer.c
index b42b502fad2f..f2b7b30a76ca 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -2247,8 +2247,8 @@ EXPORT_SYMBOL(block_commit_write);
*
* The filesystem needs to handle block truncation upon failure.
*/
-int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
- struct folio **foliop, get_block_t *get_block)
+int block_write_begin(struct kiocb *iocb, struct address_space *mapping, loff_t pos,
+ unsigned len, struct folio **foliop, get_block_t *get_block)
{
pgoff_t index = pos >> PAGE_SHIFT;
struct folio *folio;
@@ -2598,7 +2598,7 @@ int cont_write_begin(struct kiocb *iocb, struct address_space *mapping,
(*bytes)++;
}
- return block_write_begin(mapping, pos, len, foliop, get_block);
+ return block_write_begin(iocb, mapping, pos, len, foliop, get_block);
}
EXPORT_SYMBOL(cont_write_begin);
diff --git a/fs/exfat/inode.c b/fs/exfat/inode.c
index 354edcccc5e3..3032bcc6c951 100644
--- a/fs/exfat/inode.c
+++ b/fs/exfat/inode.c
@@ -455,8 +455,7 @@ static int exfat_write_begin(struct kiocb *iocb, struct address_space *mapping,
if (unlikely(exfat_forced_shutdown(mapping->host->i_sb)))
return -EIO;
- ret = block_write_begin(mapping, pos, len, foliop, exfat_get_block);
-
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, exfat_get_block);
if (ret < 0)
exfat_write_failed(mapping, pos+len);
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 66106157c7f0..b6700042db5e 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -920,7 +920,7 @@ ext2_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, ext2_get_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, ext2_get_block);
if (ret < 0)
ext2_write_failed(mapping, pos + len);
return ret;
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index ac494186926b..6b90200bab46 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -296,7 +296,7 @@ static int jfs_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, jfs_get_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, jfs_get_block);
if (unlikely(ret))
jfs_write_failed(mapping, pos + len);
diff --git a/fs/minix/inode.c b/fs/minix/inode.c
index 01011b5d045e..85fb73b37fe8 100644
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
@@ -448,7 +448,7 @@ static int minix_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, minix_get_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, 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 0ee4dea7f364..95cc7e1130bc 100644
--- a/fs/nilfs2/inode.c
+++ b/fs/nilfs2/inode.c
@@ -229,7 +229,7 @@ static int nilfs_write_begin(struct kiocb *iocb, struct address_space *mapping,
if (unlikely(err))
return err;
- err = block_write_begin(mapping, pos, len, foliop, nilfs_get_block);
+ err = block_write_begin(iocb, mapping, pos, len, foliop, 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 22aecf6e2344..6bea9f9f445d 100644
--- a/fs/nilfs2/recovery.c
+++ b/fs/nilfs2/recovery.c
@@ -541,7 +541,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,
+ err = block_write_begin(iocb, inode->i_mapping, pos, blocksize,
&folio, 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 82c09c2fcadb..36d1baf95b84 100644
--- a/fs/ntfs3/inode.c
+++ b/fs/ntfs3/inode.c
@@ -947,7 +947,7 @@ int ntfs_write_begin(struct kiocb *iocb, struct address_space *mapping,
goto out;
}
- err = block_write_begin(mapping, pos, len, foliop,
+ err = block_write_begin(iocb, mapping, pos, len, foliop,
ntfs_get_block_write_begin);
out:
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 3ae86bc2460a..3e687791da4e 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -316,7 +316,7 @@ static int omfs_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, omfs_get_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, omfs_get_block);
if (unlikely(ret))
omfs_write_failed(mapping, pos + len);
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index 13ea9aaa30e2..2b4db08e4205 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -254,7 +254,7 @@ static int udf_write_begin(struct kiocb *iocb, struct address_space *mapping,
int ret;
if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
- ret = block_write_begin(mapping, pos, len, foliop,
+ ret = block_write_begin(iocb, mapping, pos, len, foliop,
udf_get_block);
if (unlikely(ret))
udf_write_failed(mapping, pos + len);
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index 8b10833ff586..35aa1c97c1a7 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -480,7 +480,7 @@ static int ufs_write_begin(struct kiocb *iocb, struct address_space *mapping,
{
int ret;
- ret = block_write_begin(mapping, pos, len, foliop, ufs_getfrag_block);
+ ret = block_write_begin(iocb, mapping, pos, len, foliop, 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 56f7a65bd875..58d011cac9b9 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -258,8 +258,8 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,
get_block_t *get_block, struct writeback_control *wbc);
int block_read_full_folio(struct folio *, 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,
- struct folio **foliop, get_block_t *get_block);
+int block_write_begin(struct kiocb *iocb, struct address_space *mapping, loff_t pos,
+ unsigned len, struct folio **foliop, get_block_t *get_block);
int __block_write_begin(struct folio *folio, loff_t pos, unsigned len,
get_block_t *get_block);
int block_write_end(struct file *, struct address_space *,
--
2.48.1
Powered by blists - more mailing lists