From: Andrew Morton Cc: Badari Pulavarty Signed-off-by: Andrew Morton --- fs/buffer.c | 8 ++++---- include/linux/buffer_head.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN fs/buffer.c~pass-b_size-to-get_block-remove-unneeded-assignments fs/buffer.c --- devel/fs/buffer.c~pass-b_size-to-get_block-remove-unneeded-assignments 2006-03-11 02:47:09.000000000 -0800 +++ devel-akpm/fs/buffer.c 2006-03-11 02:47:09.000000000 -0800 @@ -1783,7 +1783,7 @@ static int __block_write_full_page(struc clear_buffer_dirty(bh); set_buffer_uptodate(bh); } else if (!buffer_mapped(bh) && buffer_dirty(bh)) { - bh->b_size = blocksize; + WARN_ON(bh->b_size != blocksize); err = get_block(inode, block, bh, 1); if (err) goto recover; @@ -1937,7 +1937,7 @@ static int __block_prepare_write(struct if (buffer_new(bh)) clear_buffer_new(bh); if (!buffer_mapped(bh)) { - bh->b_size = blocksize; + WARN_ON(bh->b_size != blocksize); err = get_block(inode, block, bh, 1); if (err) break; @@ -2093,7 +2093,7 @@ int block_read_full_page(struct page *pa fully_mapped = 0; if (iblock < lblock) { - bh->b_size = blocksize; + WARN_ON(bh->b_size != blocksize); err = get_block(inode, iblock, bh, 0); if (err) SetPageError(page); @@ -2676,7 +2676,7 @@ int block_truncate_page(struct address_s err = 0; if (!buffer_mapped(bh)) { - bh->b_size = blocksize; + WARN_ON(bh->b_size != blocksize); err = get_block(inode, iblock, bh, 0); if (err) goto unlock; diff -puN include/linux/buffer_head.h~pass-b_size-to-get_block-remove-unneeded-assignments include/linux/buffer_head.h --- devel/include/linux/buffer_head.h~pass-b_size-to-get_block-remove-unneeded-assignments 2006-03-11 02:47:09.000000000 -0800 +++ devel-akpm/include/linux/buffer_head.h 2006-03-11 02:47:09.000000000 -0800 @@ -280,7 +280,7 @@ map_bh(struct buffer_head *bh, struct su set_buffer_mapped(bh); bh->b_bdev = sb->s_bdev; bh->b_blocknr = block; - bh->b_size = sb->s_blocksize; + bh->b_size = sb->s_blocksize; } /* _