Merge tag 'xfs-5.16-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

torvalds · torvalds · commit 622e42a67464 · 2022-01-08T10:56:47.000-08:00
Pull xfs fix from Darrick Wong:

 - Make the old ALLOCSP ioctl behave in a consistent manner with newer
   syscalls like fallocate.

* tag 'xfs-5.16-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
@@ -687,7 +687,8 @@ xfs_ioc_space(
 
 	if (bf->l_start > XFS_ISIZE(ip)) {
 		error = xfs_alloc_file_space(ip, XFS_ISIZE(ip),
-				bf->l_start - XFS_ISIZE(ip), 0);
+				bf->l_start - XFS_ISIZE(ip),
+				XFS_BMAPI_PREALLOC);
 		if (error)
 			goto out_unlock;
 	}

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,8 @@ xfs_ioc_space(`
`687`	`687`
`688`	`688`	`if (bf->l_start > XFS_ISIZE(ip)) {`
`689`	`689`	`error = xfs_alloc_file_space(ip, XFS_ISIZE(ip),`
`690`		`- bf->l_start - XFS_ISIZE(ip), 0);`
	`690`	`+ bf->l_start - XFS_ISIZE(ip),`
	`691`	`+ XFS_BMAPI_PREALLOC);`
`691`	`692`	`if (error)`
`692`	`693`	`goto out_unlock;`
`693`	`694`	`}`