korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-23 12:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fs: Convert aops->write_begin to take a folio

Browse Source 
Convert all callers from working on a page to working on one page
of a folio (support for working on an entire folio can come later).
Removes a lot of folio->page->folio conversions.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Matthew Wilcox (Oracle) 2024-07-15 14:24:01 -04:00 committed by Christian Brauner
parent a225800f32
commit 1da86618bd
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
58 changed files with 190 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/filesystems/locking.rst
View File

@ -251,7 +251,7 @@ prototypes::
void (*readahead)(struct readahead_control *); void (*readahead)(struct readahead_control *);
int (*write_begin)(struct file *, struct address_space *mapping, int (*write_begin)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); struct folio **foliop, void **fsdata);
int (*write_end)(struct file *, struct address_space *mapping, int (*write_end)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied, loff_t pos, unsigned len, unsigned copied,
struct folio *folio, void *fsdata); struct folio *folio, void *fsdata);
@ -280,7 +280,7 @@ read_folio: yes, unlocks shared
writepages: writepages:
dirty_folio: maybe dirty_folio: maybe
readahead: yes, unlocks shared readahead: yes, unlocks shared
write_begin: locks the page exclusive write_begin: locks the folio exclusive
write_end: yes, unlocks exclusive write_end: yes, unlocks exclusive
bmap: bmap:
invalidate_folio: yes exclusive invalidate_folio: yes exclusive

6
Documentation/filesystems/vfs.rst
View File

@ -926,12 +926,12 @@ cache in your filesystem. The following members are defined:
(if they haven't been read already) so that the updated blocks (if they haven't been read already) so that the updated blocks
can be written out properly. can be written out properly.
The filesystem must return the locked pagecache page for the The filesystem must return the locked pagecache folio for the
specified offset, in ``*pagep``, for the caller to write into. specified offset, in ``*foliop``, for the caller to write into.
It must be able to cope with short writes (where the length It must be able to cope with short writes (where the length
passed to write_begin is greater than the number of bytes copied passed to write_begin is greater than the number of bytes copied
into the page). into the folio).
A void * may be returned in fsdata, which then gets passed into A void * may be returned in fsdata, which then gets passed into
write_end. write_end.

4
block/fops.c
View File

@ -451,9 +451,9 @@ static void blkdev_readahead(struct readahead_control *rac)
} }
static int blkdev_write_begin(struct file *file, struct address_space *mapping, static int blkdev_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
return block_write_begin(mapping, pos, len, pagep, blkdev_get_block); return block_write_begin(mapping, pos, len, foliop, blkdev_get_block);
} }
static int blkdev_write_end(struct file *file, struct address_space *mapping, static int blkdev_write_end(struct file *file, struct address_space *mapping,

47
drivers/gpu/drm/i915/gem/i915_gem_shmem.c
View File

@ -424,7 +424,8 @@ shmem_pwrite(struct drm_i915_gem_object *obj,
struct address_space *mapping = obj->base.filp->f_mapping; struct address_space *mapping = obj->base.filp->f_mapping;
const struct address_space_operations *aops = mapping->a_ops; const struct address_space_operations *aops = mapping->a_ops;
char __user *user_data = u64_to_user_ptr(arg->data_ptr); char __user *user_data = u64_to_user_ptr(arg->data_ptr);
u64 remain, offset; u64 remain;
loff_t pos;
unsigned int pg; unsigned int pg;
/* Caller already validated user args */ /* Caller already validated user args */
@ -457,12 +458,12 @@ shmem_pwrite(struct drm_i915_gem_object *obj,
*/ */
remain = arg->size; remain = arg->size;
offset = arg->offset; pos = arg->offset;
pg = offset_in_page(offset); pg = offset_in_page(pos);
do { do {
unsigned int len, unwritten; unsigned int len, unwritten;
struct page *page; struct folio *folio;
void *data, *vaddr; void *data, *vaddr;
int err; int err;
char __maybe_unused c; char __maybe_unused c;
@ -480,21 +481,19 @@ shmem_pwrite(struct drm_i915_gem_object *obj,
if (err) if (err)
return err; return err;
err = aops->write_begin(obj->base.filp, mapping, offset, len, err = aops->write_begin(obj->base.filp, mapping, pos, len,
&page, &data); &folio, &data);
if (err < 0) if (err < 0)
return err; return err;
vaddr = kmap_local_page(page); vaddr = kmap_local_folio(folio, offset_in_folio(folio, pos));
pagefault_disable(); pagefault_disable();
unwritten = __copy_from_user_inatomic(vaddr + pg, unwritten = __copy_from_user_inatomic(vaddr, user_data, len);
user_data,
len);
pagefault_enable(); pagefault_enable();
kunmap_local(vaddr); kunmap_local(vaddr);
err = aops->write_end(obj->base.filp, mapping, offset, len, err = aops->write_end(obj->base.filp, mapping, pos, len,
len - unwritten, page_folio(page), data); len - unwritten, folio, data);
if (err < 0) if (err < 0)
return err; return err;
@ -504,7 +503,7 @@ shmem_pwrite(struct drm_i915_gem_object *obj,
remain -= len; remain -= len;
user_data += len; user_data += len;
offset += len; pos += len;
pg = 0; pg = 0;
} while (remain); } while (remain);
@ -660,7 +659,7 @@ i915_gem_object_create_shmem_from_data(struct drm_i915_private *i915,
struct drm_i915_gem_object *obj; struct drm_i915_gem_object *obj;
struct file *file; struct file *file;
const struct address_space_operations *aops; const struct address_space_operations *aops;
resource_size_t offset; loff_t pos;
int err; int err;
GEM_WARN_ON(IS_DGFX(i915)); GEM_WARN_ON(IS_DGFX(i915));
@ -672,29 +671,27 @@ i915_gem_object_create_shmem_from_data(struct drm_i915_private *i915,
file = obj->base.filp; file = obj->base.filp;
aops = file->f_mapping->a_ops; aops = file->f_mapping->a_ops;
offset = 0; pos = 0;
do { do {
unsigned int len = min_t(typeof(size), size, PAGE_SIZE); unsigned int len = min_t(typeof(size), size, PAGE_SIZE);
struct page *page; struct folio *folio;
void *pgdata, *vaddr; void *fsdata;
err = aops->write_begin(file, file->f_mapping, offset, len, err = aops->write_begin(file, file->f_mapping, pos, len,
&page, &pgdata); &folio, &fsdata);
if (err < 0) if (err < 0)
goto fail; goto fail;
vaddr = kmap(page); memcpy_to_folio(folio, offset_in_folio(folio, pos), data, len);
memcpy(vaddr, data, len);
kunmap(page);
err = aops->write_end(file, file->f_mapping, offset, len, len, err = aops->write_end(file, file->f_mapping, pos, len, len,
page_folio(page), pgdata); folio, fsdata);
if (err < 0) if (err < 0)
goto fail; goto fail;
size -= len; size -= len;
data += len; data += len;
offset += len; pos += len;
} while (size); } while (size);
return obj; return obj;

5
fs/adfs/inode.c
View File

@ -55,12 +55,11 @@ static void adfs_write_failed(struct address_space *mapping, loff_t to)
static int adfs_write_begin(struct file *file, struct address_space *mapping, static int adfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, foliop, fsdata,
ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,
adfs_get_block, adfs_get_block,
&ADFS_I(mapping->host)->mmu_private); &ADFS_I(mapping->host)->mmu_private);
if (unlikely(ret)) if (unlikely(ret))

15
fs/affs/file.c
View File

@ -417,12 +417,11 @@ affs_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
static int affs_write_begin(struct file *file, struct address_space *mapping, static int affs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, foliop, fsdata,
ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,
affs_get_block, affs_get_block,
&AFFS_I(mapping->host)->mmu_private); &AFFS_I(mapping->host)->mmu_private);
if (unlikely(ret)) if (unlikely(ret))
@ -648,7 +647,7 @@ static int affs_read_folio_ofs(struct file *file, struct folio *folio)
static int affs_write_begin_ofs(struct file *file, struct address_space *mapping, static int affs_write_begin_ofs(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct folio *folio; struct folio *folio;
@ -671,7 +670,7 @@ static int affs_write_begin_ofs(struct file *file, struct address_space *mapping
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
if (folio_test_uptodate(folio)) if (folio_test_uptodate(folio))
return 0; return 0;
@ -881,14 +880,14 @@ affs_truncate(struct inode *inode)
if (inode->i_size > AFFS_I(inode)->mmu_private) { if (inode->i_size > AFFS_I(inode)->mmu_private) {
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
loff_t isize = inode->i_size; loff_t isize = inode->i_size;
int res; int res;
res = mapping->a_ops->write_begin(NULL, mapping, isize, 0, &page, &fsdata); res = mapping->a_ops->write_begin(NULL, mapping, isize, 0, &folio, &fsdata);
if (!res) if (!res)
res = mapping->a_ops->write_end(NULL, mapping, isize, 0, 0, page_folio(page), fsdata); res = mapping->a_ops->write_end(NULL, mapping, isize, 0, 0, folio, fsdata);
else else
inode->i_size = AFFS_I(inode)->mmu_private; inode->i_size = AFFS_I(inode)->mmu_private;
mark_inode_dirty(inode); mark_inode_dirty(inode);

5
fs/bcachefs/fs-io-buffered.c
View File

@ -659,7 +659,7 @@ int bch2_writepages(struct address_space *mapping, struct writeback_control *wbc
int bch2_write_begin(struct file *file, struct address_space *mapping, int bch2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct bch_inode_info *inode = to_bch_ei(mapping->host); struct bch_inode_info *inode = to_bch_ei(mapping->host);
struct bch_fs *c = inode->v.i_sb->s_fs_info; struct bch_fs *c = inode->v.i_sb->s_fs_info;
@ -728,12 +728,11 @@ out:
goto err; goto err;
} }
*pagep = &folio->page; *foliop = folio;
return 0; return 0;
err: err:
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);
*pagep = NULL;
err_unlock: err_unlock:
bch2_pagecache_add_put(inode); bch2_pagecache_add_put(inode);
kfree(res); kfree(res);

4
fs/bcachefs/fs-io-buffered.h
View File

@ -10,8 +10,8 @@ int bch2_read_folio(struct file *, struct folio *);
int bch2_writepages(struct address_space *, struct writeback_control *); int bch2_writepages(struct address_space *, struct writeback_control *);
void bch2_readahead(struct readahead_control *); void bch2_readahead(struct readahead_control *);
int bch2_write_begin(struct file *, struct address_space *, loff_t, int bch2_write_begin(struct file *, struct address_space *, loff_t pos,
unsigned, struct page **, void **); unsigned len, struct folio **, void **);
int bch2_write_end(struct file *, struct address_space *, loff_t, int bch2_write_end(struct file *, struct address_space *, loff_t,
unsigned len, unsigned copied, struct folio *, void *); unsigned len, unsigned copied, struct folio *, void *);

4
fs/bfs/file.c
View File

@ -172,11 +172,11 @@ static void bfs_write_failed(struct address_space *mapping, loff_t to)
static int bfs_write_begin(struct file *file, struct address_space *mapping, static int bfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, bfs_get_block); ret = block_write_begin(mapping, pos, len, foliop, bfs_get_block);
if (unlikely(ret)) if (unlikely(ret))
bfs_write_failed(mapping, pos + len); bfs_write_failed(mapping, pos + len);

28
fs/buffer.c
View File

@ -2222,7 +2222,7 @@ static void __block_commit_write(struct folio *folio, size_t from, size_t to)
* The filesystem needs to handle block truncation upon failure. * The filesystem needs to handle block truncation upon failure.
*/ */
int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len, int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
struct page **pagep, get_block_t *get_block) struct folio **foliop, get_block_t *get_block)
{ {
pgoff_t index = pos >> PAGE_SHIFT; pgoff_t index = pos >> PAGE_SHIFT;
struct folio *folio; struct folio *folio;
@ -2240,7 +2240,7 @@ int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
folio = NULL; folio = NULL;
} }
*pagep = &folio->page; *foliop = folio;
return status; return status;
} }
EXPORT_SYMBOL(block_write_begin); EXPORT_SYMBOL(block_write_begin);
@ -2467,7 +2467,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)
{ {
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
const struct address_space_operations *aops = mapping->a_ops; const struct address_space_operations *aops = mapping->a_ops;
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
int err; int err;
@ -2475,11 +2475,11 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size)
if (err) if (err)
goto out; goto out;
err = aops->write_begin(NULL, mapping, size, 0, &page, &fsdata); err = aops->write_begin(NULL, mapping, size, 0, &folio, &fsdata);
if (err) if (err)
goto out; goto out;
err = aops->write_end(NULL, mapping, size, 0, 0, page_folio(page), fsdata); err = aops->write_end(NULL, mapping, size, 0, 0, folio, fsdata);
BUG_ON(err > 0); BUG_ON(err > 0);
out: out:
@ -2493,7 +2493,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
const struct address_space_operations *aops = mapping->a_ops; const struct address_space_operations *aops = mapping->a_ops;
unsigned int blocksize = i_blocksize(inode); unsigned int blocksize = i_blocksize(inode);
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
pgoff_t index, curidx; pgoff_t index, curidx;
loff_t curpos; loff_t curpos;
@ -2512,12 +2512,12 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
len = PAGE_SIZE - zerofrom; len = PAGE_SIZE - zerofrom;
err = aops->write_begin(file, mapping, curpos, len, err = aops->write_begin(file, mapping, curpos, len,
&page, &fsdata); &folio, &fsdata);
if (err) if (err)
goto out; goto out;
zero_user(page, zerofrom, len); folio_zero_range(folio, offset_in_folio(folio, curpos), len);
err = aops->write_end(file, mapping, curpos, len, len, err = aops->write_end(file, mapping, curpos, len, len,
page_folio(page), fsdata); folio, fsdata);
if (err < 0) if (err < 0)
goto out; goto out;
BUG_ON(err != len); BUG_ON(err != len);
@ -2545,12 +2545,12 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping,
len = offset - zerofrom; len = offset - zerofrom;
err = aops->write_begin(file, mapping, curpos, len, err = aops->write_begin(file, mapping, curpos, len,
&page, &fsdata); &folio, &fsdata);
if (err) if (err)
goto out; goto out;
zero_user(page, zerofrom, len); folio_zero_range(folio, offset_in_folio(folio, curpos), len);
err = aops->write_end(file, mapping, curpos, len, len, err = aops->write_end(file, mapping, curpos, len, len,
page_folio(page), fsdata); folio, fsdata);
if (err < 0) if (err < 0)
goto out; goto out;
BUG_ON(err != len); BUG_ON(err != len);
@ -2566,7 +2566,7 @@ out:
*/ */
int cont_write_begin(struct file *file, struct address_space *mapping, int cont_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata, struct folio **foliop, void **fsdata,
get_block_t *get_block, loff_t *bytes) get_block_t *get_block, loff_t *bytes)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
@ -2584,7 +2584,7 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
(*bytes)++; (*bytes)++;
} }
return block_write_begin(mapping, pos, len, pagep, get_block); return block_write_begin(mapping, pos, len, foliop, get_block);
} }
EXPORT_SYMBOL(cont_write_begin); EXPORT_SYMBOL(cont_write_begin);

10
fs/ceph/addr.c
View File

@ -1486,20 +1486,18 @@ static int ceph_netfs_check_write_begin(struct file *file, loff_t pos, unsigned
*/ */
static int ceph_write_begin(struct file *file, struct address_space *mapping, static int ceph_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct ceph_inode_info *ci = ceph_inode(inode); struct ceph_inode_info *ci = ceph_inode(inode);
struct folio *folio = NULL;
int r; int r;
r = netfs_write_begin(&ci->netfs, file, inode->i_mapping, pos, len, &folio, NULL); r = netfs_write_begin(&ci->netfs, file, inode->i_mapping, pos, len, foliop, NULL);
if (r < 0) if (r < 0)
return r; return r;
folio_wait_private_2(folio); /* [DEPRECATED] */ folio_wait_private_2(*foliop); /* [DEPRECATED] */
WARN_ON_ONCE(!folio_test_locked(folio)); WARN_ON_ONCE(!folio_test_locked(*foliop));
*pagep = &folio->page;
return 0; return 0;
} }

7
fs/ecryptfs/mmap.c
View File

@ -255,7 +255,7 @@ out:
* @mapping: The eCryptfs object * @mapping: The eCryptfs object
* @pos: The file offset at which to start writing * @pos: The file offset at which to start writing
* @len: Length of the write * @len: Length of the write
* @pagep: Pointer to return the page * @foliop: Pointer to return the folio
* @fsdata: Pointer to return fs data (unused) * @fsdata: Pointer to return fs data (unused)
* *
* This function must zero any hole we create * This function must zero any hole we create
@ -265,7 +265,7 @@ out:
static int ecryptfs_write_begin(struct file *file, static int ecryptfs_write_begin(struct file *file,
struct address_space *mapping, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
pgoff_t index = pos >> PAGE_SHIFT; pgoff_t index = pos >> PAGE_SHIFT;
struct folio *folio; struct folio *folio;
@ -276,7 +276,7 @@ static int ecryptfs_write_begin(struct file *file,
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
prev_page_end_size = ((loff_t)index << PAGE_SHIFT); prev_page_end_size = ((loff_t)index << PAGE_SHIFT);
if (!folio_test_uptodate(folio)) { if (!folio_test_uptodate(folio)) {
@ -365,7 +365,6 @@ out:
if (unlikely(rc)) { if (unlikely(rc)) {
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);
*pagep = NULL;
} }
return rc; return rc;
} }

8
fs/exfat/file.c
View File

@ -535,20 +535,20 @@ static int exfat_file_zeroed_range(struct file *file, loff_t start, loff_t end)
while (start < end) { while (start < end) {
u32 zerofrom, len; u32 zerofrom, len;
struct page *page = NULL; struct folio *folio;
zerofrom = start & (PAGE_SIZE - 1); zerofrom = start & (PAGE_SIZE - 1);
len = PAGE_SIZE - zerofrom; len = PAGE_SIZE - zerofrom;
if (start + len > end) if (start + len > end)
len = end - start; len = end - start;
err = ops->write_begin(file, mapping, start, len, &page, NULL); err = ops->write_begin(file, mapping, start, len, &folio, NULL);
if (err) if (err)
goto out; goto out;
zero_user_segment(page, zerofrom, zerofrom + len); folio_zero_range(folio, offset_in_folio(folio, start), len);
err = ops->write_end(file, mapping, start, len, len, page_folio(page), NULL); err = ops->write_end(file, mapping, start, len, len, folio, NULL);
if (err < 0) if (err < 0)
goto out; goto out;
start += len; start += len;

5
fs/exfat/inode.c
View File

@ -448,12 +448,11 @@ static void exfat_write_failed(struct address_space *mapping, loff_t to)
static int exfat_write_begin(struct file *file, struct address_space *mapping, static int exfat_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned int len, loff_t pos, unsigned int len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = block_write_begin(mapping, pos, len, foliop, exfat_get_block);
ret = block_write_begin(mapping, pos, len, pagep, exfat_get_block);
if (ret < 0) if (ret < 0)
exfat_write_failed(mapping, pos+len); exfat_write_failed(mapping, pos+len);

4
fs/ext2/inode.c
View File

@ -916,11 +916,11 @@ static void ext2_readahead(struct readahead_control *rac)
static int static int
ext2_write_begin(struct file *file, struct address_space *mapping, ext2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, ext2_get_block); ret = block_write_begin(mapping, pos, len, foliop, ext2_get_block);
if (ret < 0) if (ret < 0)
ext2_write_failed(mapping, pos + len); ext2_write_failed(mapping, pos + len);
return ret; return ret;

4
fs/ext4/ext4.h
View File

@ -3563,13 +3563,13 @@ int ext4_readpage_inline(struct inode *inode, struct folio *folio);
extern int ext4_try_to_write_inline_data(struct address_space *mapping, extern int ext4_try_to_write_inline_data(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep); struct folio **foliop);
int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len, int ext4_write_inline_data_end(struct inode *inode, loff_t pos, unsigned len,
unsigned copied, struct folio *folio); unsigned copied, struct folio *folio);
extern int ext4_da_write_inline_data_begin(struct address_space *mapping, extern int ext4_da_write_inline_data_begin(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, struct folio **foliop,
void **fsdata); void **fsdata);
extern int ext4_try_add_inline_entry(handle_t *handle, extern int ext4_try_add_inline_entry(handle_t *handle,
struct ext4_filename *fname, struct ext4_filename *fname,

8
fs/ext4/inline.c
View File

@ -660,7 +660,7 @@ out_nofolio:
int ext4_try_to_write_inline_data(struct address_space *mapping, int ext4_try_to_write_inline_data(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep) struct folio **foliop)
{ {
int ret; int ret;
handle_t *handle; handle_t *handle;
@ -708,7 +708,7 @@ int ext4_try_to_write_inline_data(struct address_space *mapping,
goto out; goto out;
} }
*pagep = &folio->page; *foliop = folio;
down_read(&EXT4_I(inode)->xattr_sem); down_read(&EXT4_I(inode)->xattr_sem);
if (!ext4_has_inline_data(inode)) { if (!ext4_has_inline_data(inode)) {
ret = 0; ret = 0;
@ -891,7 +891,7 @@ out:
int ext4_da_write_inline_data_begin(struct address_space *mapping, int ext4_da_write_inline_data_begin(struct address_space *mapping,
struct inode *inode, struct inode *inode,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, struct folio **foliop,
void **fsdata) void **fsdata)
{ {
int ret; int ret;
@ -954,7 +954,7 @@ retry_journal:
goto out_release_page; goto out_release_page;
up_read(&EXT4_I(inode)->xattr_sem); up_read(&EXT4_I(inode)->xattr_sem);
*pagep = &folio->page; *foliop = folio;
brelse(iloc.bh); brelse(iloc.bh);
return 1; return 1;
out_release_page: out_release_page:

14
fs/ext4/inode.c
View File

@ -1145,7 +1145,7 @@ static int ext4_block_write_begin(struct folio *folio, loff_t pos, unsigned len,
*/ */
static int ext4_write_begin(struct file *file, struct address_space *mapping, static int ext4_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
int ret, needed_blocks; int ret, needed_blocks;
@ -1170,7 +1170,7 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {
ret = ext4_try_to_write_inline_data(mapping, inode, pos, len, ret = ext4_try_to_write_inline_data(mapping, inode, pos, len,
pagep); foliop);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret == 1) if (ret == 1)
@ -1270,7 +1270,7 @@ retry_journal:
folio_put(folio); folio_put(folio);
return ret; return ret;
} }
*pagep = &folio->page; *foliop = folio;
return ret; return ret;
} }
@ -2924,7 +2924,7 @@ static int ext4_nonda_switch(struct super_block *sb)
static int ext4_da_write_begin(struct file *file, struct address_space *mapping, static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret, retries = 0; int ret, retries = 0;
struct folio *folio; struct folio *folio;
@ -2939,14 +2939,14 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
if (ext4_nonda_switch(inode->i_sb) || ext4_verity_in_progress(inode)) { if (ext4_nonda_switch(inode->i_sb) || ext4_verity_in_progress(inode)) {
*fsdata = (void *)FALL_BACK_TO_NONDELALLOC; *fsdata = (void *)FALL_BACK_TO_NONDELALLOC;
return ext4_write_begin(file, mapping, pos, return ext4_write_begin(file, mapping, pos,
len, pagep, fsdata); len, foliop, fsdata);
} }
*fsdata = (void *)0; *fsdata = (void *)0;
trace_ext4_da_write_begin(inode, pos, len); trace_ext4_da_write_begin(inode, pos, len);
if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {
ret = ext4_da_write_inline_data_begin(mapping, inode, pos, len, ret = ext4_da_write_inline_data_begin(mapping, inode, pos, len,
pagep, fsdata); foliop, fsdata);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ret == 1) if (ret == 1)
@ -2981,7 +2981,7 @@ retry:
return ret; return ret;
} }
*pagep = &folio->page; *foliop = folio;
return ret; return ret;
} }

8
fs/ext4/verity.c
View File

@ -76,17 +76,17 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
while (count) { while (count) {
size_t n = min_t(size_t, count, size_t n = min_t(size_t, count,
PAGE_SIZE - offset_in_page(pos)); PAGE_SIZE - offset_in_page(pos));
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
int res; int res;
res = aops->write_begin(NULL, mapping, pos, n, &page, &fsdata); res = aops->write_begin(NULL, mapping, pos, n, &folio, &fsdata);
if (res) if (res)
return res; return res;
memcpy_to_page(page, offset_in_page(pos), buf, n); memcpy_to_folio(folio, offset_in_folio(folio, pos), buf, n);
res = aops->write_end(NULL, mapping, pos, n, n, page_folio(page), fsdata); res = aops->write_end(NULL, mapping, pos, n, n, folio, fsdata);
if (res < 0) if (res < 0)
return res; return res;
if (res != n) if (res != n)

8
fs/f2fs/data.c
View File

@ -3552,7 +3552,7 @@ reserve_block:
} }
static int f2fs_write_begin(struct file *file, struct address_space *mapping, static int f2fs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct f2fs_sb_info *sbi = F2FS_I_SB(inode); struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
@ -3584,18 +3584,20 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
#ifdef CONFIG_F2FS_FS_COMPRESSION #ifdef CONFIG_F2FS_FS_COMPRESSION
if (f2fs_compressed_file(inode)) { if (f2fs_compressed_file(inode)) {
int ret; int ret;
struct page *page;
*fsdata = NULL; *fsdata = NULL;
if (len == PAGE_SIZE && !(f2fs_is_atomic_file(inode))) if (len == PAGE_SIZE && !(f2fs_is_atomic_file(inode)))
goto repeat; goto repeat;
ret = f2fs_prepare_compress_overwrite(inode, pagep, ret = f2fs_prepare_compress_overwrite(inode, &page,
index, fsdata); index, fsdata);
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
goto fail; goto fail;
} else if (ret) { } else if (ret) {
*foliop = page_folio(page);
return 0; return 0;
} }
} }
@ -3615,7 +3617,7 @@ repeat:
/* TODO: cluster can be compressed due to race with .writepage */ /* TODO: cluster can be compressed due to race with .writepage */
*pagep = &folio->page; *foliop = folio;
if (f2fs_is_atomic_file(inode)) if (f2fs_is_atomic_file(inode))
err = prepare_atomic_write_begin(sbi, &folio->page, pos, len, err = prepare_atomic_write_begin(sbi, &folio->page, pos, len,

8
fs/f2fs/super.c
View File

@ -2677,7 +2677,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,
const struct address_space_operations *a_ops = mapping->a_ops; const struct address_space_operations *a_ops = mapping->a_ops;
int offset = off & (sb->s_blocksize - 1); int offset = off & (sb->s_blocksize - 1);
size_t towrite = len; size_t towrite = len;
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
int err = 0; int err = 0;
int tocopy; int tocopy;
@ -2687,7 +2687,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type,
towrite); towrite);
retry: retry:
err = a_ops->write_begin(NULL, mapping, off, tocopy, err = a_ops->write_begin(NULL, mapping, off, tocopy,
&page, &fsdata); &folio, &fsdata);
if (unlikely(err)) { if (unlikely(err)) {
if (err == -ENOMEM) { if (err == -ENOMEM) {
f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT); f2fs_io_schedule_timeout(DEFAULT_IO_TIMEOUT);
@ -2697,10 +2697,10 @@ retry:
break; break;
} }
memcpy_to_page(page, offset, data, tocopy); memcpy_to_folio(folio, offset_in_folio(folio, off), data, tocopy);
a_ops->write_end(NULL, mapping, off, tocopy, tocopy, a_ops->write_end(NULL, mapping, off, tocopy, tocopy,
page_folio(page), fsdata); folio, fsdata);
offset = 0; offset = 0;
towrite -= tocopy; towrite -= tocopy;
off += tocopy; off += tocopy;

8
fs/f2fs/verity.c
View File

@ -80,17 +80,17 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count,
while (count) { while (count) {
size_t n = min_t(size_t, count, size_t n = min_t(size_t, count,
PAGE_SIZE - offset_in_page(pos)); PAGE_SIZE - offset_in_page(pos));
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
int res; int res;
res = aops->write_begin(NULL, mapping, pos, n, &page, &fsdata); res = aops->write_begin(NULL, mapping, pos, n, &folio, &fsdata);
if (res) if (res)
return res; return res;
memcpy_to_page(page, offset_in_page(pos), buf, n); memcpy_to_folio(folio, offset_in_folio(folio, pos), buf, n);
res = aops->write_end(NULL, mapping, pos, n, n, page_folio(page), fsdata); res = aops->write_end(NULL, mapping, pos, n, n, folio, fsdata);
if (res < 0) if (res < 0)
return res; return res;
if (res != n) if (res != n)

5
fs/fat/inode.c
View File

@ -221,13 +221,12 @@ static void fat_write_failed(struct address_space *mapping, loff_t to)
static int fat_write_begin(struct file *file, struct address_space *mapping, static int fat_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int err; int err;
*pagep = NULL;
err = cont_write_begin(file, mapping, pos, len, err = cont_write_begin(file, mapping, pos, len,
pagep, fsdata, fat_get_block, foliop, fsdata, fat_get_block,
&MSDOS_I(mapping->host)->mmu_private); &MSDOS_I(mapping->host)->mmu_private);
if (err < 0) if (err < 0)
fat_write_failed(mapping, pos + len); fat_write_failed(mapping, pos + len);

4
fs/fuse/file.c
View File

@ -2387,7 +2387,7 @@ out:
* but how to implement it without killing performance need more thinking. * but how to implement it without killing performance need more thinking.
*/ */
static int fuse_write_begin(struct file *file, struct address_space *mapping, static int fuse_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
pgoff_t index = pos >> PAGE_SHIFT; pgoff_t index = pos >> PAGE_SHIFT;
struct fuse_conn *fc = get_fuse_conn(file_inode(file)); struct fuse_conn *fc = get_fuse_conn(file_inode(file));
@ -2421,7 +2421,7 @@ static int fuse_write_begin(struct file *file, struct address_space *mapping,
if (err) if (err)
goto cleanup; goto cleanup;
success: success:
*pagep = &folio->page; *foliop = folio;
return 0; return 0;
cleanup: cleanup:

6
fs/hfs/extent.c
View File

@ -487,15 +487,15 @@ void hfs_file_truncate(struct inode *inode)
if (inode->i_size > HFS_I(inode)->phys_size) { if (inode->i_size > HFS_I(inode)->phys_size) {
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
void *fsdata = NULL; void *fsdata = NULL;
struct page *page; struct folio *folio;
/* XXX: Can use generic_cont_expand? */ /* XXX: Can use generic_cont_expand? */
size = inode->i_size - 1; size = inode->i_size - 1;
res = hfs_write_begin(NULL, mapping, size + 1, 0, &page, res = hfs_write_begin(NULL, mapping, size + 1, 0, &folio,
&fsdata); &fsdata);
if (!res) { if (!res) {
res = generic_write_end(NULL, mapping, size + 1, 0, 0, res = generic_write_end(NULL, mapping, size + 1, 0, 0,
page_folio(page), fsdata); folio, fsdata);
} }
if (res) if (res)
inode->i_size = HFS_I(inode)->phys_size; inode->i_size = HFS_I(inode)->phys_size;

2
fs/hfs/hfs_fs.h
View File

@ -202,7 +202,7 @@ extern const struct address_space_operations hfs_aops;
extern const struct address_space_operations hfs_btree_aops; extern const struct address_space_operations hfs_btree_aops;
int hfs_write_begin(struct file *file, struct address_space *mapping, int hfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata); loff_t pos, unsigned len, struct folio **foliop, void **fsdata);
extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t); extern struct inode *hfs_new_inode(struct inode *, const struct qstr *, umode_t);
extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *); extern void hfs_inode_write_fork(struct inode *, struct hfs_extent *, __be32 *, __be32 *);
extern int hfs_write_inode(struct inode *, struct writeback_control *); extern int hfs_write_inode(struct inode *, struct writeback_control *);

5
fs/hfs/inode.c
View File

@ -45,12 +45,11 @@ static void hfs_write_failed(struct address_space *mapping, loff_t to)
} }
int hfs_write_begin(struct file *file, struct address_space *mapping, int hfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, foliop, fsdata,
ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,
hfs_get_block, hfs_get_block,
&HFS_I(mapping->host)->phys_size); &HFS_I(mapping->host)->phys_size);
if (unlikely(ret)) if (unlikely(ret))

6
fs/hfsplus/extents.c
View File

@ -554,16 +554,16 @@ void hfsplus_file_truncate(struct inode *inode)
if (inode->i_size > hip->phys_size) { if (inode->i_size > hip->phys_size) {
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
loff_t size = inode->i_size; loff_t size = inode->i_size;
res = hfsplus_write_begin(NULL, mapping, size, 0, res = hfsplus_write_begin(NULL, mapping, size, 0,
&page, &fsdata); &folio, &fsdata);
if (res) if (res)
return; return;
res = generic_write_end(NULL, mapping, size, 0, 0, res = generic_write_end(NULL, mapping, size, 0, 0,
page_folio(page), fsdata); folio, fsdata);
if (res < 0) if (res < 0)
return; return;
mark_inode_dirty(inode); mark_inode_dirty(inode);

2
fs/hfsplus/hfsplus_fs.h
View File

@ -472,7 +472,7 @@ extern const struct address_space_operations hfsplus_btree_aops;
extern const struct dentry_operations hfsplus_dentry_operations; extern const struct dentry_operations hfsplus_dentry_operations;
int hfsplus_write_begin(struct file *file, struct address_space *mapping, int hfsplus_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata); loff_t pos, unsigned len, struct folio **foliop, void **fsdata);
struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir, struct inode *hfsplus_new_inode(struct super_block *sb, struct inode *dir,
umode_t mode); umode_t mode);
void hfsplus_delete_inode(struct inode *inode); void hfsplus_delete_inode(struct inode *inode);

5
fs/hfsplus/inode.c
View File

@ -39,12 +39,11 @@ static void hfsplus_write_failed(struct address_space *mapping, loff_t to)
} }
int hfsplus_write_begin(struct file *file, struct address_space *mapping, int hfsplus_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, void **fsdata) loff_t pos, unsigned len, struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, foliop, fsdata,
ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,
hfsplus_get_block, hfsplus_get_block,
&HFSPLUS_I(mapping->host)->phys_size); &HFSPLUS_I(mapping->host)->phys_size);
if (unlikely(ret)) if (unlikely(ret))

7
fs/hostfs/hostfs_kern.c
View File

@ -465,12 +465,13 @@ static int hostfs_read_folio(struct file *file, struct folio *folio)
static int hostfs_write_begin(struct file *file, struct address_space *mapping, static int hostfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
pgoff_t index = pos >> PAGE_SHIFT; pgoff_t index = pos >> PAGE_SHIFT;
*pagep = grab_cache_page_write_begin(mapping, index); *foliop = __filemap_get_folio(mapping, index, FGP_WRITEBEGIN,
if (!*pagep) mapping_gfp_mask(mapping));
if (!*foliop)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }

5
fs/hpfs/file.c
View File

@ -190,12 +190,11 @@ static void hpfs_write_failed(struct address_space *mapping, loff_t to)
static int hpfs_write_begin(struct file *file, struct address_space *mapping, static int hpfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
*pagep = NULL; ret = cont_write_begin(file, mapping, pos, len, foliop, fsdata,
ret = cont_write_begin(file, mapping, pos, len, pagep, fsdata,
hpfs_get_block, hpfs_get_block,
&hpfs_i(mapping->host)->mmu_private); &hpfs_i(mapping->host)->mmu_private);
if (unlikely(ret)) if (unlikely(ret))

2
fs/hugetlbfs/inode.c
View File

@ -388,7 +388,7 @@ static ssize_t hugetlbfs_read_iter(struct kiocb *iocb, struct iov_iter *to)
static int hugetlbfs_write_begin(struct file *file, static int hugetlbfs_write_begin(struct file *file,
struct address_space *mapping, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
return -EINVAL; return -EINVAL;
} }

6
fs/jffs2/file.c
View File

@ -26,7 +26,7 @@ static int jffs2_write_end(struct file *filp, struct address_space *mapping,
struct folio *folio, void *fsdata); struct folio *folio, void *fsdata);
static int jffs2_write_begin(struct file *filp, struct address_space *mapping, static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); struct folio **foliop, void **fsdata);
static int jffs2_read_folio(struct file *filp, struct folio *folio); static int jffs2_read_folio(struct file *filp, struct folio *folio);
int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync) int jffs2_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
@ -125,7 +125,7 @@ static int jffs2_read_folio(struct file *file, struct folio *folio)
static int jffs2_write_begin(struct file *filp, struct address_space *mapping, static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct folio *folio; struct folio *folio;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
@ -212,7 +212,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping,
ret = PTR_ERR(folio); ret = PTR_ERR(folio);
goto release_sem; goto release_sem;
} }
*pagep = &folio->page; *foliop = folio;
/* /*
* Read in the folio if it wasn't already present. Cannot optimize away * Read in the folio if it wasn't already present. Cannot optimize away

4
fs/jfs/inode.c
View File

@ -292,11 +292,11 @@ static void jfs_write_failed(struct address_space *mapping, loff_t to)
static int jfs_write_begin(struct file *file, struct address_space *mapping, static int jfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, jfs_get_block); ret = block_write_begin(mapping, pos, len, foliop, jfs_get_block);
if (unlikely(ret)) if (unlikely(ret))
jfs_write_failed(mapping, pos + len); jfs_write_failed(mapping, pos + len);

4
fs/libfs.c
View File

@ -901,7 +901,7 @@ static int simple_read_folio(struct file *file, struct folio *folio)
int simple_write_begin(struct file *file, struct address_space *mapping, int simple_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct folio *folio; struct folio *folio;
@ -910,7 +910,7 @@ int simple_write_begin(struct file *file, struct address_space *mapping,
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
if (!folio_test_uptodate(folio) && (len != folio_size(folio))) { if (!folio_test_uptodate(folio) && (len != folio_size(folio))) {
size_t from = offset_in_folio(folio, pos); size_t from = offset_in_folio(folio, pos);

4
fs/minix/inode.c
View File

@ -444,11 +444,11 @@ static void minix_write_failed(struct address_space *mapping, loff_t to)
static int minix_write_begin(struct file *file, struct address_space *mapping, static int minix_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, minix_get_block); ret = block_write_begin(mapping, pos, len, foliop, minix_get_block);
if (unlikely(ret)) if (unlikely(ret))
minix_write_failed(mapping, pos + len); minix_write_failed(mapping, pos + len);

10
fs/namei.c
View File

@ -5304,7 +5304,7 @@ int page_symlink(struct inode *inode, const char *symname, int len)
struct address_space *mapping = inode->i_mapping; struct address_space *mapping = inode->i_mapping;
const struct address_space_operations *aops = mapping->a_ops; const struct address_space_operations *aops = mapping->a_ops;
bool nofs = !mapping_gfp_constraint(mapping, __GFP_FS); bool nofs = !mapping_gfp_constraint(mapping, __GFP_FS);
struct page *page; struct folio *folio;
void *fsdata = NULL; void *fsdata = NULL;
int err; int err;
unsigned int flags; unsigned int flags;
@ -5312,16 +5312,16 @@ int page_symlink(struct inode *inode, const char *symname, int len)
retry: retry:
if (nofs) if (nofs)
flags = memalloc_nofs_save(); flags = memalloc_nofs_save();
err = aops->write_begin(NULL, mapping, 0, len-1, &page, &fsdata); err = aops->write_begin(NULL, mapping, 0, len-1, &folio, &fsdata);
if (nofs) if (nofs)
memalloc_nofs_restore(flags); memalloc_nofs_restore(flags);
if (err) if (err)
goto fail; goto fail;
memcpy(page_address(page), symname, len-1); memcpy(folio_address(folio), symname, len - 1);
err = aops->write_end(NULL, mapping, 0, len-1, len-1, err = aops->write_end(NULL, mapping, 0, len - 1, len - 1,
page_folio(page), fsdata); folio, fsdata);
if (err < 0) if (err < 0)
goto fail; goto fail;
if (err < len-1) if (err < len-1)

4
fs/nfs/file.c
View File

@ -336,7 +336,7 @@ static bool nfs_want_read_modify_write(struct file *file, struct folio *folio,
* increment the page use counts until he is done with the page. * increment the page use counts until he is done with the page.
*/ */
static int nfs_write_begin(struct file *file, struct address_space *mapping, static int nfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep, loff_t pos, unsigned len, struct folio **foliop,
void **fsdata) void **fsdata)
{ {
fgf_t fgp = FGP_WRITEBEGIN; fgf_t fgp = FGP_WRITEBEGIN;
@ -353,7 +353,7 @@ start:
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
ret = nfs_flush_incompatible(file, folio); ret = nfs_flush_incompatible(file, folio);
if (ret) { if (ret) {

4
fs/nilfs2/inode.c
View File

@ -250,7 +250,7 @@ void nilfs_write_failed(struct address_space *mapping, loff_t to)
static int nilfs_write_begin(struct file *file, struct address_space *mapping, static int nilfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
@ -259,7 +259,7 @@ static int nilfs_write_begin(struct file *file, struct address_space *mapping,
if (unlikely(err)) if (unlikely(err))
return err; return err;
err = block_write_begin(mapping, pos, len, pagep, nilfs_get_block); err = block_write_begin(mapping, pos, len, foliop, nilfs_get_block);
if (unlikely(err)) { if (unlikely(err)) {
nilfs_write_failed(mapping, pos + len); nilfs_write_failed(mapping, pos + len);
nilfs_transaction_abort(inode->i_sb); nilfs_transaction_abort(inode->i_sb);

6
fs/nilfs2/recovery.c
View File

@ -498,7 +498,6 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,
struct inode *inode; struct inode *inode;
struct nilfs_recovery_block *rb, *n; struct nilfs_recovery_block *rb, *n;
unsigned int blocksize = nilfs->ns_blocksize; unsigned int blocksize = nilfs->ns_blocksize;
struct page *page;
struct folio *folio; struct folio *folio;
loff_t pos; loff_t pos;
int err = 0, err2 = 0; int err = 0, err2 = 0;
@ -513,7 +512,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,
pos = rb->blkoff << inode->i_blkbits; pos = rb->blkoff << inode->i_blkbits;
err = block_write_begin(inode->i_mapping, pos, blocksize, err = block_write_begin(inode->i_mapping, pos, blocksize,
&page, nilfs_get_block); &folio, nilfs_get_block);
if (unlikely(err)) { if (unlikely(err)) {
loff_t isize = inode->i_size; loff_t isize = inode->i_size;
@ -523,8 +522,7 @@ static int nilfs_recover_dsync_blocks(struct the_nilfs *nilfs,
goto failed_inode; goto failed_inode;
} }
folio = page_folio(page); err = nilfs_recovery_copy_block(nilfs, rb, pos, &folio->page);
err = nilfs_recovery_copy_block(nilfs, rb, pos, page);
if (unlikely(err)) if (unlikely(err))
goto failed_page; goto failed_page;

9
fs/ntfs3/file.c
View File

@ -182,7 +182,7 @@ static int ntfs_extend_initialized_size(struct file *file,
for (;;) { for (;;) {
u32 zerofrom, len; u32 zerofrom, len;
struct page *page; struct folio *folio;
u8 bits; u8 bits;
CLST vcn, lcn, clen; CLST vcn, lcn, clen;
@ -208,14 +208,13 @@ static int ntfs_extend_initialized_size(struct file *file,
if (pos + len > new_valid) if (pos + len > new_valid)
len = new_valid - pos; len = new_valid - pos;
err = ntfs_write_begin(file, mapping, pos, len, &page, NULL); err = ntfs_write_begin(file, mapping, pos, len, &folio, NULL);
if (err) if (err)
goto out; goto out;
zero_user_segment(page, zerofrom, PAGE_SIZE); folio_zero_range(folio, zerofrom, folio_size(folio));
/* This function in any case puts page. */ err = ntfs_write_end(file, mapping, pos, len, len, folio, NULL);
err = ntfs_write_end(file, mapping, pos, len, len, page_folio(page), NULL);
if (err < 0) if (err < 0)
goto out; goto out;
pos += len; pos += len;

7
fs/ntfs3/inode.c
View File

@ -901,7 +901,7 @@ static int ntfs_get_block_write_begin(struct inode *inode, sector_t vbn,
} }
int ntfs_write_begin(struct file *file, struct address_space *mapping, int ntfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, u32 len, struct page **pagep, void **fsdata) loff_t pos, u32 len, struct folio **foliop, void **fsdata)
{ {
int err; int err;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
@ -910,7 +910,6 @@ int ntfs_write_begin(struct file *file, struct address_space *mapping,
if (unlikely(ntfs3_forced_shutdown(inode->i_sb))) if (unlikely(ntfs3_forced_shutdown(inode->i_sb)))
return -EIO; return -EIO;
*pagep = NULL;
if (is_resident(ni)) { if (is_resident(ni)) {
struct folio *folio = __filemap_get_folio( struct folio *folio = __filemap_get_folio(
mapping, pos >> PAGE_SHIFT, FGP_WRITEBEGIN, mapping, pos >> PAGE_SHIFT, FGP_WRITEBEGIN,
@ -926,7 +925,7 @@ int ntfs_write_begin(struct file *file, struct address_space *mapping,
ni_unlock(ni); ni_unlock(ni);
if (!err) { if (!err) {
*pagep = &folio->page; *foliop = folio;
goto out; goto out;
} }
folio_unlock(folio); folio_unlock(folio);
@ -936,7 +935,7 @@ int ntfs_write_begin(struct file *file, struct address_space *mapping,
goto out; goto out;
} }
err = block_write_begin(mapping, pos, len, pagep, err = block_write_begin(mapping, pos, len, foliop,
ntfs_get_block_write_begin); ntfs_get_block_write_begin);
out: out:

2
fs/ntfs3/ntfs_fs.h
View File

@ -711,7 +711,7 @@ int ntfs_set_size(struct inode *inode, u64 new_size);
int ntfs_get_block(struct inode *inode, sector_t vbn, int ntfs_get_block(struct inode *inode, sector_t vbn,
struct buffer_head *bh_result, int create); struct buffer_head *bh_result, int create);
int ntfs_write_begin(struct file *file, struct address_space *mapping, int ntfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, u32 len, struct page **pagep, void **fsdata); loff_t pos, u32 len, struct folio **foliop, void **fsdata);
int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos, int ntfs_write_end(struct file *file, struct address_space *mapping, loff_t pos,
u32 len, u32 copied, struct folio *folio, void *fsdata); u32 len, u32 copied, struct folio *folio, void *fsdata);
int ntfs3_write_inode(struct inode *inode, struct writeback_control *wbc); int ntfs3_write_inode(struct inode *inode, struct writeback_control *wbc);

10
fs/ocfs2/aops.c
View File

@ -1643,7 +1643,7 @@ static int ocfs2_zero_tail(struct inode *inode, struct buffer_head *di_bh,
int ocfs2_write_begin_nolock(struct address_space *mapping, int ocfs2_write_begin_nolock(struct address_space *mapping,
loff_t pos, unsigned len, ocfs2_write_type_t type, loff_t pos, unsigned len, ocfs2_write_type_t type,
struct page **pagep, void **fsdata, struct folio **foliop, void **fsdata,
struct buffer_head *di_bh, struct page *mmap_page) struct buffer_head *di_bh, struct page *mmap_page)
{ {
int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS; int ret, cluster_of_pages, credits = OCFS2_INODE_UPDATE_CREDITS;
@ -1826,8 +1826,8 @@ try_again:
ocfs2_free_alloc_context(meta_ac); ocfs2_free_alloc_context(meta_ac);
success: success:
if (pagep) if (foliop)
*pagep = wc->w_target_page; *foliop = page_folio(wc->w_target_page);
*fsdata = wc; *fsdata = wc;
return 0; return 0;
out_quota: out_quota:
@ -1879,7 +1879,7 @@ out:
static int ocfs2_write_begin(struct file *file, struct address_space *mapping, static int ocfs2_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
struct buffer_head *di_bh = NULL; struct buffer_head *di_bh = NULL;
@ -1901,7 +1901,7 @@ static int ocfs2_write_begin(struct file *file, struct address_space *mapping,
down_write(&OCFS2_I(inode)->ip_alloc_sem); down_write(&OCFS2_I(inode)->ip_alloc_sem);
ret = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_BUFFER, ret = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_BUFFER,
pagep, fsdata, di_bh, NULL); foliop, fsdata, di_bh, NULL);
if (ret) { if (ret) {
mlog_errno(ret); mlog_errno(ret);
goto out_fail; goto out_fail;

2
fs/ocfs2/aops.h
View File

@ -38,7 +38,7 @@ typedef enum {
int ocfs2_write_begin_nolock(struct address_space *mapping, int ocfs2_write_begin_nolock(struct address_space *mapping,
loff_t pos, unsigned len, ocfs2_write_type_t type, loff_t pos, unsigned len, ocfs2_write_type_t type,
struct page **pagep, void **fsdata, struct folio **foliop, void **fsdata,
struct buffer_head *di_bh, struct page *mmap_page); struct buffer_head *di_bh, struct page *mmap_page);
int ocfs2_read_inline_data(struct inode *inode, struct page *page, int ocfs2_read_inline_data(struct inode *inode, struct page *page,

6
fs/ocfs2/mmap.c
View File

@ -53,7 +53,7 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,
loff_t pos = page_offset(page); loff_t pos = page_offset(page);
unsigned int len = PAGE_SIZE; unsigned int len = PAGE_SIZE;
pgoff_t last_index; pgoff_t last_index;
struct page *locked_page = NULL; struct folio *locked_folio = NULL;
void *fsdata; void *fsdata;
loff_t size = i_size_read(inode); loff_t size = i_size_read(inode);
@ -91,7 +91,7 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,
len = ((size - 1) & ~PAGE_MASK) + 1; len = ((size - 1) & ~PAGE_MASK) + 1;
err = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_MMAP, err = ocfs2_write_begin_nolock(mapping, pos, len, OCFS2_WRITE_MMAP,
&locked_page, &fsdata, di_bh, page); &locked_folio, &fsdata, di_bh, page);
if (err) { if (err) {
if (err != -ENOSPC) if (err != -ENOSPC)
mlog_errno(err); mlog_errno(err);
@ -99,7 +99,7 @@ static vm_fault_t __ocfs2_page_mkwrite(struct file *file,
goto out; goto out;
} }
if (!locked_page) { if (!locked_folio) {
ret = VM_FAULT_NOPAGE; ret = VM_FAULT_NOPAGE;
goto out; goto out;
} }

4
fs/omfs/file.c
View File

@ -312,11 +312,11 @@ static void omfs_write_failed(struct address_space *mapping, loff_t to)
static int omfs_write_begin(struct file *file, struct address_space *mapping, static int omfs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, omfs_get_block); ret = block_write_begin(mapping, pos, len, foliop, omfs_get_block);
if (unlikely(ret)) if (unlikely(ret))
omfs_write_failed(mapping, pos + len); omfs_write_failed(mapping, pos + len);

4
fs/orangefs/inode.c
View File

@ -309,7 +309,7 @@ static int orangefs_read_folio(struct file *file, struct folio *folio)
static int orangefs_write_begin(struct file *file, static int orangefs_write_begin(struct file *file,
struct address_space *mapping, loff_t pos, unsigned len, struct address_space *mapping, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct orangefs_write_range *wr; struct orangefs_write_range *wr;
struct folio *folio; struct folio *folio;
@ -320,7 +320,7 @@ static int orangefs_write_begin(struct file *file,
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
if (folio_test_dirty(folio) && !folio_test_private(folio)) { if (folio_test_dirty(folio) && !folio_test_private(folio)) {
/* /*

4
fs/reiserfs/inode.c
View File

@ -2735,7 +2735,7 @@ static void reiserfs_truncate_failed_write(struct inode *inode)
static int reiserfs_write_begin(struct file *file, static int reiserfs_write_begin(struct file *file,
struct address_space *mapping, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode; struct inode *inode;
struct folio *folio; struct folio *folio;
@ -2749,7 +2749,7 @@ static int reiserfs_write_begin(struct file *file,
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
reiserfs_wait_on_write_block(inode->i_sb); reiserfs_wait_on_write_block(inode->i_sb);
fix_tail_page_for_writing(&folio->page); fix_tail_page_for_writing(&folio->page);

4
fs/sysv/itree.c
View File

@ -483,11 +483,11 @@ static void sysv_write_failed(struct address_space *mapping, loff_t to)
static int sysv_write_begin(struct file *file, struct address_space *mapping, static int sysv_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, get_block); ret = block_write_begin(mapping, pos, len, foliop, get_block);
if (unlikely(ret)) if (unlikely(ret))
sysv_write_failed(mapping, pos + len); sysv_write_failed(mapping, pos + len);

10
fs/ubifs/file.c
View File

@ -211,7 +211,7 @@ static void release_existing_page_budget(struct ubifs_info *c)
} }
static int write_begin_slow(struct address_space *mapping, static int write_begin_slow(struct address_space *mapping,
loff_t pos, unsigned len, struct page **pagep) loff_t pos, unsigned len, struct folio **foliop)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct ubifs_info *c = inode->i_sb->s_fs_info; struct ubifs_info *c = inode->i_sb->s_fs_info;
@ -298,7 +298,7 @@ static int write_begin_slow(struct address_space *mapping,
ubifs_release_dirty_inode_budget(c, ui); ubifs_release_dirty_inode_budget(c, ui);
} }
*pagep = &folio->page; *foliop = folio;
return 0; return 0;
} }
@ -414,7 +414,7 @@ static int allocate_budget(struct ubifs_info *c, struct folio *folio,
*/ */
static int ubifs_write_begin(struct file *file, struct address_space *mapping, static int ubifs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct ubifs_info *c = inode->i_sb->s_fs_info; struct ubifs_info *c = inode->i_sb->s_fs_info;
@ -483,7 +483,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);
return write_begin_slow(mapping, pos, len, pagep); return write_begin_slow(mapping, pos, len, foliop);
} }
/* /*
@ -492,7 +492,7 @@ static int ubifs_write_begin(struct file *file, struct address_space *mapping,
* with @ui->ui_mutex locked if we are appending pages, and unlocked * with @ui->ui_mutex locked if we are appending pages, and unlocked
* otherwise. This is an optimization (slightly hacky though). * otherwise. This is an optimization (slightly hacky though).
*/ */
*pagep = &folio->page; *foliop = folio;
return 0; return 0;
} }

6
fs/udf/inode.c
View File

@ -246,14 +246,14 @@ static void udf_readahead(struct readahead_control *rac)
static int udf_write_begin(struct file *file, struct address_space *mapping, static int udf_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct udf_inode_info *iinfo = UDF_I(file_inode(file)); struct udf_inode_info *iinfo = UDF_I(file_inode(file));
struct folio *folio; struct folio *folio;
int ret; int ret;
if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) { if (iinfo->i_alloc_type != ICBTAG_FLAG_AD_IN_ICB) {
ret = block_write_begin(mapping, pos, len, pagep, ret = block_write_begin(mapping, pos, len, foliop,
udf_get_block); udf_get_block);
if (unlikely(ret)) if (unlikely(ret))
udf_write_failed(mapping, pos + len); udf_write_failed(mapping, pos + len);
@ -265,7 +265,7 @@ static int udf_write_begin(struct file *file, struct address_space *mapping,
mapping_gfp_mask(mapping)); mapping_gfp_mask(mapping));
if (IS_ERR(folio)) if (IS_ERR(folio))
return PTR_ERR(folio); return PTR_ERR(folio);
*pagep = &folio->page; *foliop = folio;
if (!folio_test_uptodate(folio)) if (!folio_test_uptodate(folio))
udf_adinicb_read_folio(folio); udf_adinicb_read_folio(folio);
return 0; return 0;

4
fs/ufs/inode.c
View File

@ -498,11 +498,11 @@ static void ufs_write_failed(struct address_space *mapping, loff_t to)
static int ufs_write_begin(struct file *file, struct address_space *mapping, static int ufs_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
int ret; int ret;
ret = block_write_begin(mapping, pos, len, pagep, ufs_getfrag_block); ret = block_write_begin(mapping, pos, len, foliop, ufs_getfrag_block);
if (unlikely(ret)) if (unlikely(ret))
ufs_write_failed(mapping, pos + len); ufs_write_failed(mapping, pos + len);

4
include/linux/buffer_head.h
View File

@ -258,7 +258,7 @@ int __block_write_full_folio(struct inode *inode, struct folio *folio,
int block_read_full_folio(struct folio *, get_block_t *); int block_read_full_folio(struct folio *, get_block_t *);
bool block_is_partially_uptodate(struct folio *, size_t from, size_t count); 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, int block_write_begin(struct address_space *mapping, loff_t pos, unsigned len,
struct page **pagep, get_block_t *get_block); struct folio **foliop, get_block_t *get_block);
int __block_write_begin(struct page *page, loff_t pos, unsigned len, int __block_write_begin(struct page *page, loff_t pos, unsigned len,
get_block_t *get_block); get_block_t *get_block);
int block_write_end(struct file *, struct address_space *, int block_write_end(struct file *, struct address_space *,
@ -269,7 +269,7 @@ int generic_write_end(struct file *, struct address_space *,
struct folio *, void *); struct folio *, void *);
void folio_zero_new_buffers(struct folio *folio, size_t from, size_t to); void folio_zero_new_buffers(struct folio *folio, size_t from, size_t to);
int cont_write_begin(struct file *, struct address_space *, loff_t, int cont_write_begin(struct file *, struct address_space *, loff_t,
unsigned, struct page **, void **, unsigned, struct folio **, void **,
get_block_t *, loff_t *); get_block_t *, loff_t *);
int generic_cont_expand_simple(struct inode *inode, loff_t size); int generic_cont_expand_simple(struct inode *inode, loff_t size);
void block_commit_write(struct page *page, unsigned int from, unsigned int to); void block_commit_write(struct page *page, unsigned int from, unsigned int to);

4
include/linux/fs.h
View File

@ -408,7 +408,7 @@ struct address_space_operations {
int (*write_begin)(struct file *, struct address_space *mapping, int (*write_begin)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); struct folio **foliop, void **fsdata);
int (*write_end)(struct file *, struct address_space *mapping, int (*write_end)(struct file *, struct address_space *mapping,
loff_t pos, unsigned len, unsigned copied, loff_t pos, unsigned len, unsigned copied,
struct folio *folio, void *fsdata); struct folio *folio, void *fsdata);
@ -3331,7 +3331,7 @@ extern ssize_t noop_direct_IO(struct kiocb *iocb, struct iov_iter *iter);
extern int simple_empty(struct dentry *); extern int simple_empty(struct dentry *);
extern int simple_write_begin(struct file *file, struct address_space *mapping, extern int simple_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata); struct folio **foliop, void **fsdata);
extern const struct address_space_operations ram_aops; extern const struct address_space_operations ram_aops;
extern int always_delete_dentry(const struct dentry *); extern int always_delete_dentry(const struct dentry *);
extern struct inode *alloc_anon_inode(struct super_block *); extern struct inode *alloc_anon_inode(struct super_block *);

4
mm/filemap.c
View File

@ -3987,7 +3987,6 @@ ssize_t generic_perform_write(struct kiocb *iocb, struct iov_iter *i)
ssize_t written = 0; ssize_t written = 0;
do { do {
struct page *page;
struct folio *folio; struct folio *folio;
size_t offset; /* Offset into folio */ size_t offset; /* Offset into folio */
size_t bytes; /* Bytes to write to folio */ size_t bytes; /* Bytes to write to folio */
@ -4017,11 +4016,10 @@ retry:
} }
status = a_ops->write_begin(file, mapping, pos, bytes, status = a_ops->write_begin(file, mapping, pos, bytes,
&page, &fsdata); &folio, &fsdata);
if (unlikely(status < 0)) if (unlikely(status < 0))
break; break;
folio = page_folio(page);
offset = offset_in_folio(folio, pos); offset = offset_in_folio(folio, pos);
if (bytes > folio_size(folio) - offset) if (bytes > folio_size(folio) - offset)
bytes = folio_size(folio) - offset; bytes = folio_size(folio) - offset;

8
mm/shmem.c
View File

@ -2882,7 +2882,7 @@ static const struct inode_operations shmem_short_symlink_operations;
static int static int
shmem_write_begin(struct file *file, struct address_space *mapping, shmem_write_begin(struct file *file, struct address_space *mapping,
loff_t pos, unsigned len, loff_t pos, unsigned len,
struct page **pagep, void **fsdata) struct folio **foliop, void **fsdata)
{ {
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
struct shmem_inode_info *info = SHMEM_I(inode); struct shmem_inode_info *info = SHMEM_I(inode);
@ -2903,14 +2903,14 @@ shmem_write_begin(struct file *file, struct address_space *mapping,
if (ret) if (ret)
return ret; return ret;
*pagep = folio_file_page(folio, index); if (folio_test_hwpoison(folio) ||
if (PageHWPoison(*pagep)) { (folio_test_large(folio) && folio_test_has_hwpoisoned(folio))) {
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);
*pagep = NULL;
return -EIO; return -EIO;
} }
*foliop = folio;
return 0; return 0;
} }