Update bcachefs sources to 1a739db0b256 bcachefs; guard against overflow in btree...

[bcachefs-tools-debian] / libbcachefs / fs-io-buffered.c

diff --git a/libbcachefs/fs-io-buffered.c b/libbcachefs/fs-io-buffered.c
index 637a83e4d961bf7b623617421543d9148329ec6e..e48b364db5aeb5015e1546f3175dc3a71723d182 100644 (file)
--- a/libbcachefs/fs-io-buffered.c
+++ b/libbcachefs/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;