aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2015-07-03 14:51:32 +0100
committerBen Hutchings <ben@decadent.org.uk>2015-08-12 16:33:20 +0200
commita62b33eed7aba186f0d8ffad97b732335db414c8 (patch)
tree5029eda6d34640444f58626a9f813d8ee22d3a04
parent0dca2ecbbe794fcce0b74557295fc5e9730f538e (diff)
downloadkernel_samsung_smdk4412-a62b33eed7aba186f0d8ffad97b732335db414c8.zip
kernel_samsung_smdk4412-a62b33eed7aba186f0d8ffad97b732335db414c8.tar.gz
kernel_samsung_smdk4412-a62b33eed7aba186f0d8ffad97b732335db414c8.tar.bz2
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 <ejt@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-rw-r--r--drivers/md/persistent-data/dm-btree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index bbb2ec5..18f37e0 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -236,7 +236,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;