summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/fs-io-buffered.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-12-16 21:40:26 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2024-01-01 11:47:42 -0500
commitdefd9e39b59961ea0fd774020fb5c05dba199412 (patch)
tree25875b3bd5b7af3a67b159c9ca674ccc76967c0d /fs/bcachefs/fs-io-buffered.c
parent559e6c23367f4c122834e7bf4eeac0a3ac382149 (diff)
downloadlinux-stable-defd9e39b59961ea0fd774020fb5c05dba199412.tar.gz
linux-stable-defd9e39b59961ea0fd774020fb5c05dba199412.tar.bz2
linux-stable-defd9e39b59961ea0fd774020fb5c05dba199412.zip
bcachefs: darray_for_each() now declares loop iter
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/fs-io-buffered.c')
-rw-r--r--fs/bcachefs/fs-io-buffered.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/bcachefs/fs-io-buffered.c b/fs/bcachefs/fs-io-buffered.c
index 637a83e4d961..e48b364db5ae 100644
--- a/fs/bcachefs/fs-io-buffered.c
+++ b/fs/bcachefs/fs-io-buffered.c
@@ -52,14 +52,11 @@ struct readpages_iter {
static int readpages_iter_init(struct readpages_iter *iter,
struct readahead_control *ractl)
{
- struct folio **fi;
- int ret;
-
memset(iter, 0, sizeof(*iter));
iter->mapping = ractl->mapping;
- ret = bch2_filemap_get_contig_folios_d(iter->mapping,
+ int ret = bch2_filemap_get_contig_folios_d(iter->mapping,
ractl->_index << PAGE_SHIFT,
(ractl->_index + ractl->_nr_pages) << PAGE_SHIFT,
0, mapping_gfp_mask(iter->mapping),
@@ -826,7 +823,7 @@ static int __bch2_buffered_write(struct bch_inode_info *inode,
struct bch_fs *c = inode->v.i_sb->s_fs_info;
struct bch2_folio_reservation res;
folios fs;
- struct folio **fi, *f;
+ struct folio *f;
unsigned copied = 0, f_offset, f_copied;
u64 end = pos + len, f_pos, f_len;
loff_t last_folio_pos = inode->v.i_size;