|
@@ -2061,6 +2061,7 @@ int generic_write_end(struct file *file, struct address_space *mapping,
|
|
struct page *page, void *fsdata)
|
|
struct page *page, void *fsdata)
|
|
{
|
|
{
|
|
struct inode *inode = mapping->host;
|
|
struct inode *inode = mapping->host;
|
|
|
|
+ int i_size_changed = 0;
|
|
|
|
|
|
copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
|
|
copied = block_write_end(file, mapping, pos, len, copied, page, fsdata);
|
|
|
|
|
|
@@ -2073,12 +2074,21 @@ int generic_write_end(struct file *file, struct address_space *mapping,
|
|
*/
|
|
*/
|
|
if (pos+copied > inode->i_size) {
|
|
if (pos+copied > inode->i_size) {
|
|
i_size_write(inode, pos+copied);
|
|
i_size_write(inode, pos+copied);
|
|
- mark_inode_dirty(inode);
|
|
|
|
|
|
+ i_size_changed = 1;
|
|
}
|
|
}
|
|
|
|
|
|
unlock_page(page);
|
|
unlock_page(page);
|
|
page_cache_release(page);
|
|
page_cache_release(page);
|
|
|
|
|
|
|
|
+ /*
|
|
|
|
+ * Don't mark the inode dirty under page lock. First, it unnecessarily
|
|
|
|
+ * makes the holding time of page lock longer. Second, it forces lock
|
|
|
|
+ * ordering of page lock and transaction start for journaling
|
|
|
|
+ * filesystems.
|
|
|
|
+ */
|
|
|
|
+ if (i_size_changed)
|
|
|
|
+ mark_inode_dirty(inode);
|
|
|
|
+
|
|
return copied;
|
|
return copied;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(generic_write_end);
|
|
EXPORT_SYMBOL(generic_write_end);
|