Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 5ec8b75e3a2a94860ee99b5456fe1a963c8680e5

Authored by Aneesh Kumar K.V
Committed by Linus Torvalds
1 parent 6a897cf447

ext3: truncate block allocated on a failed ext3_write_begin 

For blocksize < pagesize we need to remove blocks that got allocated in
block_write_begin() if we fail with ENOSPC for later blocks.
block_write_begin() internally does this if it allocated page locally.
This makes sure we don't have blocks outside inode.i_size during ENOSPC.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 7 additions and 0 deletions Side-by-side Diff

... ... @@ -1186,6 +1186,13 @@
1186 1186 ext3_journal_stop(handle);
1187 1187 unlock_page(page);
1188 1188 page_cache_release(page);
  1189 + /*
  1190 + * block_write_begin may have instantiated a few blocks
  1191 + * outside i_size. Trim these off again. Don't need
  1192 + * i_size_read because we hold i_mutex.
  1193 + */
  1194 + if (pos + len > inode->i_size)
  1195 + vmtruncate(inode, inode->i_size);
1189 1196 }
1190 1197 if (ret == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))
1191 1198 goto retry;