summaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 19:15:18 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 19:15:18 -0700
commit91a5698d1f253d30f53f0c58d2504eaec481b854 (patch)
tree684d8060e16b33c6ede5b814dbd459e0c5cb1f39 /mm
parent084bad91afd0f40ff4db9ceb56e29234c314d8d1 (diff)
parentdddac6a7b445de95515f64fdf82fe5dc36c02f26 (diff)
downloadop-kernel-dev-91a5698d1f253d30f53f0c58d2504eaec481b854.zip
op-kernel-dev-91a5698d1f253d30f53f0c58d2504eaec481b854.tar.gz
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6: PM / Hibernate: Replace bdget call with simple atomic_inc of i_count PM / ACPI: HP G7000 Notebook needs a SCI_EN resume quirk
Diffstat (limited to 'mm')
-rw-r--r--mm/swapfile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c
index d1ade1a..8ffdc0d 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -753,7 +753,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
if (!bdev) {
if (bdev_p)
- *bdev_p = bdget(sis->bdev->bd_dev);
+ *bdev_p = bdgrab(sis->bdev);
spin_unlock(&swap_lock);
return i;
@@ -765,7 +765,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)
struct swap_extent, list);
if (se->start_block == offset) {
if (bdev_p)
- *bdev_p = bdget(sis->bdev->bd_dev);
+ *bdev_p = bdgrab(sis->bdev);
spin_unlock(&swap_lock);
bdput(bdev);
OpenPOWER on IntegriCloud