Commit 13e4d257 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-7.1/dm-fixes-2' of... 

Merge tag 'for-7.1/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fix from Mikulas Patocka:

 - fix crashes in dm-vdo if GFP_NOWAIT allocation fails

* tag 'for-7.1/dm-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm vdo: use GFP_NOIO for blkdev_issue_zeroout on format path
parents c112662a fb7415f2

drivers/md/dm-vdo/vdo.c

+2 −2
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ static int __must_check clear_partition(struct vdo *vdo, enum partition_id id) 
	return blkdev_issue_zeroout(vdo_get_backing_device(vdo),

				    partition->offset * VDO_SECTORS_PER_BLOCK,

				    partition->count * VDO_SECTORS_PER_BLOCK,

				    GFP_NOWAIT, 0);

				    GFP_NOIO, 0);

}



int vdo_clear_layout(struct vdo *vdo)
@@ -976,7 +976,7 @@ int vdo_clear_layout(struct vdo *vdo) 
	result = blkdev_issue_zeroout(vdo_get_backing_device(vdo),

				      VDO_SECTORS_PER_BLOCK,

				      VDO_SECTORS_PER_BLOCK,

				      GFP_NOWAIT, 0);

				      GFP_NOIO, 0);

	if (result != VDO_SUCCESS)

		return result;