fat: zero out seek range on _fat_get_block
Subsystems (2)
PATCH 3/5 fat: zero out seek range on _fat_get_block
From: Namjae Jeon <[email protected]>
For normal buffered write operations, normally if we try to write to an offset > than file size, it does a cont_expand_zero till that offset. Now, in case of fallocated regions, since the blocks are already allocated. So, make it zero out that buffers for those blocks till the seek'ed offset.
Signed-off-by Namjae Jeon <[email protected]>
Signed-off-by Amit Sahrawat <[email protected]>
--- fs/fat/cache.c | 3 ++- fs/fat/inode.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-)
fs/fat/cache.c +2 -1
@@ -334,7 +334,8 @@ int fat_bmap(struct inode *inode, sector_t sector, sector_t *phys,*/ last_block = (MSDOS_I (inode)->i_disksize + (blocksize -1 )) >> blocksize_bits; -if (sector >= last_block) +if (sector >= last_block && +MSDOS_I (inode)->mmu_private ==MSDOS_I (inode)->i_disksize)return 0 ; }
fs/fat/inode.c +13 -2
@@ -61,15 +61,26 @@ static inline int __fat_get_block(struct inode *inode, sector_t iblock,struct super_block *sb = inode->i_sb;struct msdos_sb_info *sbi =MSDOS_SB (sb);unsigned long mapped_blocks; -sector_t phys; +sector_t phys, last_block, disk_block;int err, offset; +const unsigned long blocksize = sb->s_blocksize; +const unsigned char blocksize_bits = sb->s_blocksize_bits; err =fat_bmap (inode, iblock, &phys, &mapped_blocks, create);if (err)return err;if (phys) { -map_bh (bh_result, sb, phys); *max_blocks =min (mapped_blocks, *max_blocks); + last_block = (MSDOS_I (inode)->mmu_private + (blocksize -1 )) + >> blocksize_bits; + disk_block = (MSDOS_I (inode)->i_disksize + (blocksize -1 )) + >> blocksize_bits; +if (iblock >= last_block && iblock <= disk_block) { +MSDOS_I (inode)->mmu_private += + *max_blocks << blocksize_bits; +set_buffer_new (bh_result); + } +map_bh (bh_result, sb, phys);return 0 ; }if (!create)
Signature · 1 line
1.7.9.5
OGAWA Hirofumi
maintainerfs/fat/inode.c static inline int __fat_get_block(struct inode *inode, sector_t iblock, · line 80
Quoted 7 lines · Namjae Jeon
fs/fat/inode.c +7
-0+ last_block = (MSDOS_I (inode)->mmu_private + (blocksize -1 )) + >> blocksize_bits; + disk_block = (MSDOS_I (inode)->i_disksize + (blocksize -1 )) + >> blocksize_bits; +if (iblock >= last_block && iblock <= disk_block) { +MSDOS_I (inode)->mmu_private += + *max_blocks << blocksize_bits;
Hm, mmu_private is not increased by write_begin()?
Signature · 1 line
OGAWA Hirofumi <[email protected]>
OGAWA Hirofumi
maintainerQuoted 11 lines · OGAWA Hirofumi
fs/fat/inode.c static inline int __fat_get_block(struct inode *inode, sector_t iblock, · line 80
Quoted 7 lines · Namjae Jeon
fs/fat/inode.c +7
-0+ last_block = (MSDOS_I (inode)->mmu_private + (blocksize -1 )) + >> blocksize_bits; + disk_block = (MSDOS_I (inode)->i_disksize + (blocksize -1 )) + >> blocksize_bits; +if (iblock >= last_block && iblock <= disk_block) { +MSDOS_I (inode)->mmu_private += + *max_blocks << blocksize_bits;Hm,
mmu_privateis not increased bywrite_begin()?
Ah, ok. I understood what this is doing. Please ignore this comment.
Signature · 1 line
OGAWA Hirofumi <[email protected]>