summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Thornber <ejt@redhat.com>2015-07-03 14:51:32 +0100
committerLuis Henriques <luis.henriques@canonical.com>2015-08-10 09:54:12 +0100
commit75064b474a354372d794560b55b6017d5c5ce18c (patch)
tree65c591180298992f60d9b40cb36c690350d2c3d4
parent7ec0d6ed2c7f10cca4e9411934fdcddc55308fce (diff)
downloadlinux-stable-75064b474a354372d794560b55b6017d5c5ce18c.tar.gz
linux-stable-75064b474a354372d794560b55b6017d5c5ce18c.tar.bz2
linux-stable-75064b474a354372d794560b55b6017d5c5ce18c.zip
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: Luis Henriques <luis.henriques@canonical.com>
-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;