From 07d695b79d726ae3064d2e76aec8369c12a4b42e Mon Sep 17 00:00:00 2001 From: Ming Lei Date: Fri, 22 Feb 2013 16:34:13 -0800 Subject: [PATCH] --- yaml --- r: 356554 b: refs/heads/master c: 25e823c8c37d123b77ce12a042da889e6bb5f9d1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/genhd.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 16fcacfdbd29..56a0ad1244bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e823407f7b11fa06ba8e7a2801eb9ed11268a7ec +refs/heads/master: 25e823c8c37d123b77ce12a042da889e6bb5f9d1 diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 3993ebf4135f..5f73c2435fde 100644 --- a/trunk/block/genhd.c +++ b/trunk/block/genhd.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "blk.h" @@ -534,6 +535,14 @@ static void register_disk(struct gendisk *disk) return; } } + + /* + * avoid probable deadlock caused by allocating memory with + * GFP_KERNEL in runtime_resume callback of its all ancestor + * devices + */ + pm_runtime_set_memalloc_noio(ddev, true); + disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj); disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj); @@ -663,6 +672,7 @@ void del_gendisk(struct gendisk *disk) disk->driverfs_dev = NULL; if (!sysfs_deprecated) sysfs_remove_link(block_depr, dev_name(disk_to_dev(disk))); + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); device_del(disk_to_dev(disk)); } EXPORT_SYMBOL(del_gendisk);