From: Joe Thornber Date: Fri, 3 Jul 2015 13:51:32 +0000 (+0100) Subject: dm btree: silence lockdep lock inversion in dm_btree_del() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=47af854f2ad3d458238a5dedc747415dc218e8c8;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git dm btree: silence lockdep lock inversion in dm_btree_del() commit 1c7518794a3647eb345d59ee52844e8a40405198 upstream. Allocate memory using GFP_NOIO when deleting a btree. dm_btree_del() can be called via an ioctl and we don't want to recurse into the FS or block layer. Signed-off-by: Joe Thornber Signed-off-by: Mike Snitzer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c index 0a7592e8881..e3ecb0b824b 100644 --- a/drivers/md/persistent-data/dm-btree.c +++ b/drivers/md/persistent-data/dm-btree.c @@ -240,7 +240,7 @@ int dm_btree_del(struct dm_btree_info *info, dm_block_t root) int r; struct del_stack *s; - s = kmalloc(sizeof(*s), GFP_KERNEL); + s = kmalloc(sizeof(*s), GFP_NOIO); if (!s) return -ENOMEM; s->tm = info->tm;