mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 10:58:48 +09:00
UPSTREAM: f2fs: support SEEK_DATA and SEEK_HOLE for compression files
Fix to support SEEK_DATA and SEEK_HOLE for compression files Bug: 325092012 Change-Id: Iba62c53e634682205f84c8dc3566ab8df9079158 Signed-off-by: Daeho Jeong <daehojeong@google.com> Reviewed-by: Chao Yu <chao@kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org> (cherry picked from commit a94c7fded76bfd1a061deae7be80fedbfa26774e)
This commit is contained in:
committed by
William McVicker
parent
672918d432
commit
268f1fed50
@@ -391,9 +391,20 @@ int f2fs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
|
|||||||
return f2fs_do_sync_file(file, start, end, datasync, false);
|
return f2fs_do_sync_file(file, start, end, datasync, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool __found_offset(struct address_space *mapping, block_t blkaddr,
|
static bool __found_offset(struct address_space *mapping,
|
||||||
pgoff_t index, int whence)
|
struct dnode_of_data *dn, pgoff_t index, int whence)
|
||||||
{
|
{
|
||||||
|
block_t blkaddr = f2fs_data_blkaddr(dn);
|
||||||
|
struct inode *inode = mapping->host;
|
||||||
|
bool compressed_cluster = false;
|
||||||
|
|
||||||
|
if (f2fs_compressed_file(inode)) {
|
||||||
|
block_t first_blkaddr = data_blkaddr(dn->inode, dn->node_page,
|
||||||
|
ALIGN_DOWN(dn->ofs_in_node, F2FS_I(inode)->i_cluster_size));
|
||||||
|
|
||||||
|
compressed_cluster = first_blkaddr == COMPRESS_ADDR;
|
||||||
|
}
|
||||||
|
|
||||||
switch (whence) {
|
switch (whence) {
|
||||||
case SEEK_DATA:
|
case SEEK_DATA:
|
||||||
if (__is_valid_data_blkaddr(blkaddr))
|
if (__is_valid_data_blkaddr(blkaddr))
|
||||||
@@ -401,8 +412,12 @@ static bool __found_offset(struct address_space *mapping, block_t blkaddr,
|
|||||||
if (blkaddr == NEW_ADDR &&
|
if (blkaddr == NEW_ADDR &&
|
||||||
xa_get_mark(&mapping->i_pages, index, PAGECACHE_TAG_DIRTY))
|
xa_get_mark(&mapping->i_pages, index, PAGECACHE_TAG_DIRTY))
|
||||||
return true;
|
return true;
|
||||||
|
if (compressed_cluster)
|
||||||
|
return true;
|
||||||
break;
|
break;
|
||||||
case SEEK_HOLE:
|
case SEEK_HOLE:
|
||||||
|
if (compressed_cluster)
|
||||||
|
return false;
|
||||||
if (blkaddr == NULL_ADDR)
|
if (blkaddr == NULL_ADDR)
|
||||||
return true;
|
return true;
|
||||||
break;
|
break;
|
||||||
@@ -471,7 +486,7 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence)
|
|||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (__found_offset(file->f_mapping, blkaddr,
|
if (__found_offset(file->f_mapping, &dn,
|
||||||
pgofs, whence)) {
|
pgofs, whence)) {
|
||||||
f2fs_put_dnode(&dn);
|
f2fs_put_dnode(&dn);
|
||||||
goto found;
|
goto found;
|
||||||
|
|||||||
Reference in New Issue
Block a user