diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-11 13:59:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2022-01-11 13:59:43 +0100 |
| commit | 2f2f523a31b8dd289394a2690c03a025b1de6e47 (patch) | |
| tree | 0bbb2227da26836b396a243472edef1edcc3bf70 /fs | |
| parent | 14d5042fdcd703bd08b3cc829aed4f39d448f398 (diff) | |
| parent | b0ee52316847cf279a1028334117985a5d633c0c (diff) | |
Merge 4.4.299 into android-4.4-p
Changes in 4.4.299
bpf, test: fix ld_abs + vlan push/pop stress test
Bluetooth: btusb: Apply QCA Rome patches for some ATH3012 models
ieee802154: atusb: fix uninit value in atusb_set_extended_addr
mac80211: initialize variable have_higher_than_11mbit
i40e: Fix incorrect netdev's real number of RX/TX queues
sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc
xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate
rndis_host: support Hytera digital radios
phonet: refcount leak in pep_sock_accep
scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown()
ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate
net: udp: fix alignment problem in udp4_seq_show()
mISDN: change function names to avoid conflicts
power: reset: ltc2952: Fix use of floating point literals
Linux 4.4.299
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I0272e2e79cebce38fdb9ecb51f62be9d9effed7a
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/xfs_ioctl.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index e4a4f82ea13f..2e4f78d68b05 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -729,7 +729,8 @@ xfs_ioc_space( flags |= XFS_PREALLOC_CLEAR; 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; } |