summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2015-07-03 14:51:32 +0100
committerMike Snitzer <snitzer@redhat.com>2015-07-06 10:45:02 -0400
commit1c7518794a3647eb345d59ee52844e8a40405198 (patch)
tree2c98c3c7448645836876e37895b5ef9b9c96ef38
parenta822c83e47d97cdef38c4352e1ef62d9f46cfe98 (diff)
downloadlinux-stable-1c7518794a3647eb345d59ee52844e8a40405198.tar.gz
linux-stable-1c7518794a3647eb345d59ee52844e8a40405198.tar.bz2
linux-stable-1c7518794a3647eb345d59ee52844e8a40405198.zip
dm btree: silence lockdep lock inversion in dm_btree_del()
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> Cc: stable@vger.kernel.org
-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 200ac12a1d40..fdd3793e22f9 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -255,7 +255,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->info = info;