summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 18:16:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-03 18:16:21 -0800
commit51bb296b09a83ee1aae025778db38f9d2cc7bb1a (patch)
tree739f445b953aa77e82a429fe3a939d0b4cb3d222 /mm
parentdc79d2f21a2dc19df26f0cb0b46be2d6241b627b (diff)
parent4b27e1bb442e964903f8a3fa6bdf33a602dc0941 (diff)
downloadop-kernel-dev-51bb296b09a83ee1aae025778db38f9d2cc7bb1a.zip
op-kernel-dev-51bb296b09a83ee1aae025778db38f9d2cc7bb1a.tar.gz
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: cfq-iosched: limit coop preemption cfq-iosched: fix bad return value cfq_should_preempt() backing-dev: bdi sb prune should be in the unregister path, not destroy Fix bio_alloc() and bio_kmalloc() documentation bio_put(): add bio_clone() to the list of functions in the comment
Diffstat (limited to 'mm')
-rw-r--r--mm/backing-dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c
index 1065b71..11aee09 100644
--- a/mm/backing-dev.c
+++ b/mm/backing-dev.c
@@ -628,6 +628,8 @@ static void bdi_prune_sb(struct backing_dev_info *bdi)
void bdi_unregister(struct backing_dev_info *bdi)
{
if (bdi->dev) {
+ bdi_prune_sb(bdi);
+
if (!bdi_cap_flush_forker(bdi))
bdi_wb_shutdown(bdi);
bdi_debug_unregister(bdi);
@@ -697,7 +699,6 @@ void bdi_destroy(struct backing_dev_info *bdi)
spin_unlock(&inode_lock);
}
- bdi_prune_sb(bdi);
bdi_unregister(bdi);
for (i = 0; i < NR_BDI_STAT_ITEMS; i++)
OpenPOWER on IntegriCloud