From e7f5c02818960ee991d1952524231e666c62eff5 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Tue, 12 May 2009 14:40:37 -0400 Subject: [PATCH] --- yaml --- r: 145013 b: refs/heads/master c: 33b9817e2ae097c7b8d256e3510ac6c54fc6d9d0 h: refs/heads/master i: 145011: edae969da69b424d52dc5a504c01bd33e2c5d1e2 v: v3 --- [refs] | 2 +- trunk/fs/ext4/inode.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b92f7bdeb036..20a5d8a144f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c1ee184a30394e54165fa4c15923cabd952c106 +refs/heads/master: 33b9817e2ae097c7b8d256e3510ac6c54fc6d9d0 diff --git a/trunk/fs/ext4/inode.c b/trunk/fs/ext4/inode.c index d4b634ae06bd..0ac31a06422b 100644 --- a/trunk/fs/ext4/inode.c +++ b/trunk/fs/ext4/inode.c @@ -2297,6 +2297,10 @@ static int ext4_da_get_block_prep(struct inode *inode, sector_t iblock, struct buffer_head *bh_result, int create) { int ret = 0; + sector_t invalid_block = ~((sector_t) 0xffff); + + if (invalid_block < ext4_blocks_count(EXT4_SB(inode->i_sb)->s_es)) + invalid_block = ~0; BUG_ON(create == 0); BUG_ON(bh_result->b_size != inode->i_sb->s_blocksize); @@ -2318,7 +2322,7 @@ static int ext4_da_get_block_prep(struct inode *inode, sector_t iblock, /* not enough space to reserve */ return ret; - map_bh(bh_result, inode->i_sb, 0); + map_bh(bh_result, inode->i_sb, invalid_block); set_buffer_new(bh_result); set_buffer_delay(bh_result); } else if (ret > 0) {