From: Evgeniy Dushistov * After block allocation, we map it on the same "address" as 8 others blocks * We nullify block several times: once in ufs/block.c and once in block_*write_full_page, and use different "caches" for this. Signed-off-by: Evgeniy Dushistov Signed-off-by: Andrew Morton --- fs/ufs/balloc.c | 15 --------------- fs/ufs/inode.c | 31 +++++++++++++++++++------------ 2 files changed, 19 insertions(+), 27 deletions(-) diff -puN fs/ufs/balloc.c~ufs-right-block-allocation fs/ufs/balloc.c --- devel/fs/ufs/balloc.c~ufs-right-block-allocation 2006-05-14 02:48:04.000000000 -0700 +++ devel-akpm/fs/ufs/balloc.c 2006-05-14 02:48:04.000000000 -0700 @@ -223,18 +223,6 @@ failed: } - -#define NULLIFY_FRAGMENTS \ - for (i = oldcount; i < newcount; i++) { \ - bh = sb_getblk(sb, result + i); \ - memset (bh->b_data, 0, sb->s_blocksize); \ - set_buffer_uptodate(bh); \ - mark_buffer_dirty (bh); \ - if (IS_SYNC(inode)) \ - sync_dirty_buffer(bh); \ - brelse (bh); \ - } - unsigned ufs_new_fragments (struct inode * inode, __fs32 * p, unsigned fragment, unsigned goal, unsigned count, int * err ) { @@ -312,7 +300,6 @@ unsigned ufs_new_fragments (struct inode *err = 0; inode->i_blocks += count << uspi->s_nspfshift; UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count); - NULLIFY_FRAGMENTS } unlock_super(sb); UFSD(("EXIT, result %u\n", result)) @@ -327,7 +314,6 @@ unsigned ufs_new_fragments (struct inode *err = 0; inode->i_blocks += count << uspi->s_nspfshift; UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count); - NULLIFY_FRAGMENTS unlock_super(sb); UFSD(("EXIT, result %u\n", result)) return result; @@ -379,7 +365,6 @@ unsigned ufs_new_fragments (struct inode *err = 0; inode->i_blocks += count << uspi->s_nspfshift; UFS_I(inode)->i_lastfrag = max_t(u32, UFS_I(inode)->i_lastfrag, fragment + count); - NULLIFY_FRAGMENTS unlock_super(sb); if (newcount < request) ufs_free_fragments (inode, result + newcount, request - newcount); diff -puN fs/ufs/inode.c~ufs-right-block-allocation fs/ufs/inode.c --- devel/fs/ufs/inode.c~ufs-right-block-allocation 2006-05-14 02:48:04.000000000 -0700 +++ devel-akpm/fs/ufs/inode.c 2006-05-14 02:51:14.000000000 -0700 @@ -161,6 +161,18 @@ out: return ret; } +static inline void ufs_clear_block(struct inode *inode, struct buffer_head *bh) +{ + lock_buffer(bh); + memset(bh->b_data, 0, inode->i_sb->s_blocksize); + set_buffer_uptodate(bh); + mark_buffer_dirty(bh); + unlock_buffer(bh); + if (IS_SYNC(inode)) + sync_dirty_buffer(bh); +} + + static struct buffer_head * ufs_inode_getfrag (struct inode *inode, unsigned int fragment, unsigned int new_fragment, unsigned int required, int *err, int metadata, long *phys, int *new) @@ -204,7 +216,7 @@ repeat: brelse (result); goto repeat; } else { - *phys = tmp; + *phys = tmp+blockoff; return NULL; } } @@ -259,14 +271,11 @@ repeat: return NULL; } - /* The nullification of framgents done in ufs/balloc.c is - * something I don't have the stomache to move into here right - * now. -DaveM - */ if (metadata) { result = sb_getblk(inode->i_sb, tmp + blockoff); + ufs_clear_block(inode, result); } else { - *phys = tmp; + *phys = tmp+blockoff; result = NULL; *err = 0; *new = 1; @@ -333,7 +342,7 @@ repeat: brelse (result); goto repeat; } else { - *phys = tmp; + *phys = tmp+blockoff; goto out; } } @@ -349,14 +358,12 @@ repeat: goto out; } - /* The nullification of framgents done in ufs/balloc.c is - * something I don't have the stomache to move into here right - * now. -DaveM - */ + if (metadata) { result = sb_getblk(sb, tmp + blockoff); + ufs_clear_block(inode, result); } else { - *phys = tmp; + *phys = tmp+blockoff; *new = 1; } _