|
@@ -1631,11 +1631,15 @@ static long btrfs_fallocate(struct file *file, int mode,
|
|
|
|
|
|
cur_offset = alloc_start;
|
|
|
while (1) {
|
|
|
+ u64 actual_end;
|
|
|
+
|
|
|
em = btrfs_get_extent(inode, NULL, 0, cur_offset,
|
|
|
alloc_end - cur_offset, 0);
|
|
|
BUG_ON(IS_ERR_OR_NULL(em));
|
|
|
last_byte = min(extent_map_end(em), alloc_end);
|
|
|
+ actual_end = min_t(u64, extent_map_end(em), offset + len);
|
|
|
last_byte = (last_byte + mask) & ~mask;
|
|
|
+
|
|
|
if (em->block_start == EXTENT_MAP_HOLE ||
|
|
|
(cur_offset >= inode->i_size &&
|
|
|
!test_bit(EXTENT_FLAG_PREALLOC, &em->flags))) {
|
|
@@ -1648,6 +1652,16 @@ static long btrfs_fallocate(struct file *file, int mode,
|
|
|
free_extent_map(em);
|
|
|
break;
|
|
|
}
|
|
|
+ } else if (actual_end > inode->i_size &&
|
|
|
+ !(mode & FALLOC_FL_KEEP_SIZE)) {
|
|
|
+ /*
|
|
|
+ * We didn't need to allocate any more space, but we
|
|
|
+ * still extended the size of the file so we need to
|
|
|
+ * update i_size.
|
|
|
+ */
|
|
|
+ inode->i_ctime = CURRENT_TIME;
|
|
|
+ i_size_write(inode, actual_end);
|
|
|
+ btrfs_ordered_update_i_size(inode, actual_end, NULL);
|
|
|
}
|
|
|
free_extent_map(em);
|
|
|
|