|
@@ -5487,21 +5487,7 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * Need to round down offset to be aligned with page size boundary
|
|
|
- * for page size > block size.
|
|
|
- */
|
|
|
- ioffset = round_down(offset, PAGE_SIZE);
|
|
|
-
|
|
|
- /* Write out all dirty pages */
|
|
|
- ret = filemap_write_and_wait_range(inode->i_mapping, ioffset,
|
|
|
- LLONG_MAX);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
- /* Take mutex lock */
|
|
|
mutex_lock(&inode->i_mutex);
|
|
|
-
|
|
|
/*
|
|
|
* There is no need to overlap collapse range with EOF, in which case
|
|
|
* it is effectively a truncate operation
|
|
@@ -5526,6 +5512,27 @@ int ext4_collapse_range(struct inode *inode, loff_t offset, loff_t len)
|
|
|
* page cache.
|
|
|
*/
|
|
|
down_write(&EXT4_I(inode)->i_mmap_sem);
|
|
|
+ /*
|
|
|
+ * Need to round down offset to be aligned with page size boundary
|
|
|
+ * for page size > block size.
|
|
|
+ */
|
|
|
+ ioffset = round_down(offset, PAGE_SIZE);
|
|
|
+ /*
|
|
|
+ * Write tail of the last page before removed range since it will get
|
|
|
+ * removed from the page cache below.
|
|
|
+ */
|
|
|
+ ret = filemap_write_and_wait_range(inode->i_mapping, ioffset, offset);
|
|
|
+ if (ret)
|
|
|
+ goto out_mmap;
|
|
|
+ /*
|
|
|
+ * Write data that will be shifted to preserve them when discarding
|
|
|
+ * page cache below. We are also protected from pages becoming dirty
|
|
|
+ * by i_mmap_sem.
|
|
|
+ */
|
|
|
+ ret = filemap_write_and_wait_range(inode->i_mapping, offset + len,
|
|
|
+ LLONG_MAX);
|
|
|
+ if (ret)
|
|
|
+ goto out_mmap;
|
|
|
truncate_pagecache(inode, ioffset);
|
|
|
|
|
|
credits = ext4_writepage_trans_blocks(inode);
|
|
@@ -5626,21 +5633,7 @@ int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * Need to round down to align start offset to page size boundary
|
|
|
- * for page size > block size.
|
|
|
- */
|
|
|
- ioffset = round_down(offset, PAGE_SIZE);
|
|
|
-
|
|
|
- /* Write out all dirty pages */
|
|
|
- ret = filemap_write_and_wait_range(inode->i_mapping, ioffset,
|
|
|
- LLONG_MAX);
|
|
|
- if (ret)
|
|
|
- return ret;
|
|
|
-
|
|
|
- /* Take mutex lock */
|
|
|
mutex_lock(&inode->i_mutex);
|
|
|
-
|
|
|
/* Currently just for extent based files */
|
|
|
if (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
|
|
|
ret = -EOPNOTSUPP;
|
|
@@ -5668,6 +5661,16 @@ int ext4_insert_range(struct inode *inode, loff_t offset, loff_t len)
|
|
|
* page cache.
|
|
|
*/
|
|
|
down_write(&EXT4_I(inode)->i_mmap_sem);
|
|
|
+ /*
|
|
|
+ * Need to round down to align start offset to page size boundary
|
|
|
+ * for page size > block size.
|
|
|
+ */
|
|
|
+ ioffset = round_down(offset, PAGE_SIZE);
|
|
|
+ /* Write out all dirty pages */
|
|
|
+ ret = filemap_write_and_wait_range(inode->i_mapping, ioffset,
|
|
|
+ LLONG_MAX);
|
|
|
+ if (ret)
|
|
|
+ goto out_mmap;
|
|
|
truncate_pagecache(inode, ioffset);
|
|
|
|
|
|
credits = ext4_writepage_trans_blocks(inode);
|