Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be0847f authored by Sami Tolvanen's avatar Sami Tolvanen
Browse files

ANDROID: fs: logfs: fix filler function type 



Bug: 67506682
Change-Id: If2659b91e250cbd9f1a4a028ff43caf71b8306dd
Signed-off-by: default avatarSami Tolvanen <samitolvanen@google.com>
parent 920c7fd6

fs/logfs/dev_bdev.c

+2 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ static int sync_request(struct page *page, struct block_device *bdev, int op) 
	return submit_bio_wait(&bio);

}



static int bdev_readpage(void *_sb, struct page *page)

static int bdev_readpage(struct file *_sb, struct page *page)

{

	struct super_block *sb = _sb;

	struct super_block *sb = (struct super_block *)_sb;

	struct block_device *bdev = logfs_super(sb)->s_bdev;

	int err;

fs/logfs/dev_mtd.c

+2 −2
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ static void logfs_mtd_sync(struct super_block *sb) 
	mtd_sync(mtd);

}



static int logfs_mtd_readpage(void *_sb, struct page *page)

static int logfs_mtd_readpage(struct file *_sb, struct page *page)

{

	struct super_block *sb = _sb;

	struct super_block *sb = (struct super_block *)_sb;

	int err;



	err = logfs_mtd_read(sb, page->index << PAGE_SHIFT, PAGE_SIZE,

fs/logfs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static struct page *logfs_get_dd_page(struct inode *dir, struct dentry *dentry) 
		if (!logfs_exist_block(dir, index))

			continue;

		page = read_cache_page(dir->i_mapping, index,

				(filler_t *)logfs_readpage, NULL);

				logfs_readpage, NULL);

		if (IS_ERR(page))

			return page;

		dd = kmap_atomic(page);
@@ -306,7 +306,7 @@ static int logfs_readdir(struct file *file, struct dir_context *ctx) 
			continue;

		}

		page = read_cache_page(dir->i_mapping, pos,

				(filler_t *)logfs_readpage, NULL);

				logfs_readpage, NULL);

		if (IS_ERR(page))

			return PTR_ERR(page);

		dd = kmap(page);

fs/logfs/logfs.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ struct logfs_device_ops { 
	struct page *(*find_first_sb)(struct super_block *sb, u64 *ofs);

	struct page *(*find_last_sb)(struct super_block *sb, u64 *ofs);

	int (*write_sb)(struct super_block *sb, struct page *page);

	int (*readpage)(void *_sb, struct page *page);

	int (*readpage)(struct file *_sb, struct page *page);

	void (*writeseg)(struct super_block *sb, u64 ofs, size_t len);

	int (*erase)(struct super_block *sb, loff_t ofs, size_t len,

			int ensure_write);