hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hpfs: use iomap_fiemap to implement ->fiemap 

hpfs is the last user of generic_block_fiemap, so add a trivial
iomap_ops based on the ext2 version and switch to iomap_fiemap.

Link: https://lore.kernel.org/r/20210720133341.405438-4-hch@lst.de
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Christoph Hellwig 2021-07-20 15:33:40 +02:00 committed by Jan Kara
parent 8b1e7076d2
commit e0cba89d22
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fs/hpfs/Kconfig
View File

@ -2,6 +2,7 @@
config HPFS_FS config HPFS_FS
tristate "OS/2 HPFS file system support" tristate "OS/2 HPFS file system support"
depends on BLOCK depends on BLOCK
select FS_IOMAP
help help
OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS OS/2 is IBM's operating system for PC's, the same as Warp, and HPFS
is the file system used for organizing files on OS/2 hard disk is the file system used for organizing files on OS/2 hard disk

51
fs/hpfs/file.c
View File

@ -9,6 +9,7 @@
#include "hpfs_fn.h" #include "hpfs_fn.h"
#include <linux/mpage.h> #include <linux/mpage.h>
#include <linux/iomap.h>
#include <linux/fiemap.h> #include <linux/fiemap.h>
#define BLOCKS(size) (((size) + 511) >> 9) #define BLOCKS(size) (((size) + 511) >> 9)
@ -116,6 +117,47 @@ static int hpfs_get_block(struct inode *inode, sector_t iblock, struct buffer_he
return r; return r;
} }
static int hpfs_iomap_begin(struct inode *inode, loff_t offset, loff_t length,
unsigned flags, struct iomap *iomap, struct iomap *srcmap)
{
struct super_block *sb = inode->i_sb;
unsigned int blkbits = inode->i_blkbits;
unsigned int n_secs;
secno s;
if (WARN_ON_ONCE(flags & (IOMAP_WRITE | IOMAP_ZERO)))
return -EINVAL;
iomap->bdev = inode->i_sb->s_bdev;
iomap->offset = offset;
hpfs_lock(sb);
s = hpfs_bmap(inode, offset >> blkbits, &n_secs);
if (s) {
n_secs = hpfs_search_hotfix_map_for_range(sb, s,
min_t(loff_t, n_secs, length));
if (unlikely(!n_secs)) {
s = hpfs_search_hotfix_map(sb, s);
n_secs = 1;
}
iomap->type = IOMAP_MAPPED;
iomap->flags = IOMAP_F_MERGED;
iomap->addr = (u64)s << blkbits;
iomap->length = (u64)n_secs << blkbits;
} else {
iomap->type = IOMAP_HOLE;
iomap->addr = IOMAP_NULL_ADDR;
iomap->length = 1 << blkbits;
}
hpfs_unlock(sb);
return 0;
}
static const struct iomap_ops hpfs_iomap_ops = {
.iomap_begin = hpfs_iomap_begin,
};
static int hpfs_readpage(struct file *file, struct page *page) static int hpfs_readpage(struct file *file, struct page *page)
{ {
return mpage_readpage(page, hpfs_get_block); return mpage_readpage(page, hpfs_get_block);
@ -192,7 +234,14 @@ static sector_t _hpfs_bmap(struct address_space *mapping, sector_t block)
static int hpfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len) static int hpfs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len)
{ {
return generic_block_fiemap(inode, fieinfo, start, len, hpfs_get_block); int ret;
inode_lock(inode);
len = min_t(u64, len, i_size_read(inode));
ret = iomap_fiemap(inode, fieinfo, start, len, &hpfs_iomap_ops);
inode_unlock(inode);
return ret;
} }
const struct address_space_operations hpfs_aops = { const struct address_space_operations hpfs_aops = {