|
@@ -1151,6 +1151,16 @@ static int do_journal_get_write_access(handle_t *handle,
|
|
|
return ext3_journal_get_write_access(handle, bh);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * Truncate blocks that were not used by write. We have to truncate the
|
|
|
+ * pagecache as well so that corresponding buffers get properly unmapped.
|
|
|
+ */
|
|
|
+static void ext3_truncate_failed_write(struct inode *inode)
|
|
|
+{
|
|
|
+ truncate_inode_pages(inode->i_mapping, inode->i_size);
|
|
|
+ ext3_truncate(inode);
|
|
|
+}
|
|
|
+
|
|
|
static int ext3_write_begin(struct file *file, struct address_space *mapping,
|
|
|
loff_t pos, unsigned len, unsigned flags,
|
|
|
struct page **pagep, void **fsdata)
|
|
@@ -1209,7 +1219,7 @@ write_begin_failed:
|
|
|
unlock_page(page);
|
|
|
page_cache_release(page);
|
|
|
if (pos + len > inode->i_size)
|
|
|
- ext3_truncate(inode);
|
|
|
+ ext3_truncate_failed_write(inode);
|
|
|
}
|
|
|
if (ret == -ENOSPC && ext3_should_retry_alloc(inode->i_sb, &retries))
|
|
|
goto retry;
|
|
@@ -1304,7 +1314,7 @@ static int ext3_ordered_write_end(struct file *file,
|
|
|
page_cache_release(page);
|
|
|
|
|
|
if (pos + len > inode->i_size)
|
|
|
- ext3_truncate(inode);
|
|
|
+ ext3_truncate_failed_write(inode);
|
|
|
return ret ? ret : copied;
|
|
|
}
|
|
|
|
|
@@ -1330,7 +1340,7 @@ static int ext3_writeback_write_end(struct file *file,
|
|
|
page_cache_release(page);
|
|
|
|
|
|
if (pos + len > inode->i_size)
|
|
|
- ext3_truncate(inode);
|
|
|
+ ext3_truncate_failed_write(inode);
|
|
|
return ret ? ret : copied;
|
|
|
}
|
|
|
|
|
@@ -1383,7 +1393,7 @@ static int ext3_journalled_write_end(struct file *file,
|
|
|
page_cache_release(page);
|
|
|
|
|
|
if (pos + len > inode->i_size)
|
|
|
- ext3_truncate(inode);
|
|
|
+ ext3_truncate_failed_write(inode);
|
|
|
return ret ? ret : copied;
|
|
|
}
|
|
|
|