diff options
| author | Namjae Jeon <namjae.jeon@samsung.com> | 2013-11-05 16:57:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 16:57:31 +1100 |
| commit | d45d5c0fdbb6f1bd99e8634d448d139521cc18c1 (patch) | |
| tree | e2a2847ccdf07bc781bd170010fcc3edefbad05b /fs | |
| parent | 6e0f4660896c3c2251e7085e160ae96cbd579879 (diff) | |
fat: zero out seek range on _fat_get_block
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 <namjae.jeon@samsung.com>
Signed-off-by: Amit Sahrawat <a.sahrawat@samsung.com>
Cc: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/fat/cache.c | 3 | ||||
| -rw-r--r-- | fs/fat/inode.c | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/fs/fat/cache.c b/fs/fat/cache.c index 37572c29c741..7dc689e14fcf 100644 --- a/fs/fat/cache.c +++ b/fs/fat/cache.c @@ -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; } diff --git a/fs/fat/inode.c b/fs/fat/inode.c index beb82833402c..5ee94238c5dd 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -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) |