fat: permit to return phy block number by fibmap in fallocated region
Subsystems (2)
PATCH 5/5 fat: permit to return phy block number by fibmap in fallocated region
From: Namjae Jeon <[email protected]>
Make the fibmap call the return the proper physical block number for any offset request in the fallocated range.
Signed-off-by Namjae Jeon <[email protected]>
Signed-off-by Amit Sahrawat <[email protected]>
--- fs/fat/cache.c | 16 ++++++++++++++-- fs/fat/inode.c | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-)
fs/fat/cache.c +14 -2
@@ -312,6 +312,7 @@ int fat_bmap(struct inode *inode, sector_t sector, sector_t *phys,const unsigned char blocksize_bits = sb->s_blocksize_bits;sector_t last_block;int cluster, offset; +loff_t i_size =i_size_read (inode); *phys =0 ; *mapped_blocks =0 ;
@@ -323,10 +324,20 @@ int fat_bmap(struct inode *inode, sector_t sector, sector_t *phys,return 0 ; } - last_block = (i_size_read (inode) + (blocksize -1 )) >> blocksize_bits; + last_block = (i_size + (blocksize -1 )) >> blocksize_bits;if (sector >= last_block) { -if (!create) +if (!create) { +/* +* to map cluster in case of read request +* for a block in fallocated region +*/ +if (MSDOS_I (inode)->i_disksize > +round_up (i_size, sb->s_blocksize)) { + goto out_map_cluster; + } +return 0 ; + }/* * ->i_disksize can access on only allocation path.
@@ -339,6 +350,7 @@ int fat_bmap(struct inode *inode, sector_t sector, sector_t *phys,return 0 ; } +out_map_cluster: cluster = sector >> (sbi->cluster_bits - sb->s_blocksize_bits); offset = sector & (sbi->sec_per_clus -1 ); cluster =fat_bmap_cluster (inode, cluster);
fs/fat/inode.c +2 -2
@@ -243,9 +243,9 @@ static sector_t _fat_bmap(struct address_space *mapping, sector_t block)sector_t blocknr;/* fat_get_cluster() assumes the requested blocknr isn't truncated. */ -down_read (&MSDOS_I (mapping->host)->truncate_lock); +mutex_lock (&mapping->host->i_mutex); blocknr =generic_block_bmap (mapping, block, fat_get_block); -up_read (&MSDOS_I (mapping->host)->truncate_lock); +mutex_unlock (&mapping->host->i_mutex);return blocknr; }
Signature · 1 line
1.7.9.5