Aneesh Kumar K.V wrote: > For blocksize < pagesize we need to remove blocks that > got allocte in block_wirte_begin if we fail with ENOSPC > for later blocks. block_write_begin internally does > this if it allocated page locally. This make sure > we don't have blocks outisde inode.i_size during > ENOSPC I think this is good; here's an easy testcase: # dd if=/dev/zero of=fsfile bs=1k count=2048 # mkfs.ext3 -F fsfile # mkdir mnt # mount -o loop fsfile mnt/ # dd if=/dev/zero of=mnt/1kfile bs=1k count=1 # cd mnt/ # dd if=/dev/zero of=bigfile bs=4k # cd .. # umount mnt # e2fsck -f fsfile e2fsck 1.39 (29-May-2006) Pass 1: Checking inodes, blocks, and sizes Inode 13, i_size is 974848, should be 976896. Fix<y>? ... can you test with that, unless you already have a testcase you've used? Assuming it fixes it (it should) you can add: Acked-by: Eric Sandeen <sandeen@xxxxxxxxxx> -Eric > Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@xxxxxxxxxxxxxxxxxx> > --- > fs/ext3/inode.c | 7 +++++++ > 1 files changed, 7 insertions(+), 0 deletions(-) > > diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c > index ebfec4d..f8424ad 100644 > --- a/fs/ext3/inode.c > +++ b/fs/ext3/inode.c > @@ -1186,6 +1186,13 @@ static int ext3_write_begin(struct file *file, struct address_space *mapping, > ext3_journal_stop(handle); > unlock_page(page); > page_cache_release(page); > + /* > + * block_write_begin may have instantiated a few blocks > + * outside i_size. Trim these off again. Don't need > + * i_size_read because we hold i_mutex. > + */ > + if (pos + len > inode->i_size) > + vmtruncate(inode, inode->i_size); > } > if (ret == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries)) > goto retry; -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
