diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-29 22:15:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-29 22:15:18 -0400 |
| commit | 91a5698d1f253d30f53f0c58d2504eaec481b854 (patch) | |
| tree | 684d8060e16b33c6ede5b814dbd459e0c5cb1f39 /mm | |
| parent | 084bad91afd0f40ff4db9ceb56e29234c314d8d1 (diff) | |
| parent | dddac6a7b445de95515f64fdf82fe5dc36c02f26 (diff) | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index d1ade1a48ee7..8ffdc0d23c53 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) | |||
| 753 | 753 | ||
| 754 | if (!bdev) { | 754 | if (!bdev) { |
| 755 | if (bdev_p) | 755 | if (bdev_p) |
| 756 | *bdev_p = bdget(sis->bdev->bd_dev); | 756 | *bdev_p = bdgrab(sis->bdev); |
| 757 | 757 | ||
| 758 | spin_unlock(&swap_lock); | 758 | spin_unlock(&swap_lock); |
| 759 | return i; | 759 | return i; |
| @@ -765,7 +765,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) | |||
| 765 | struct swap_extent, list); | 765 | struct swap_extent, list); |
| 766 | if (se->start_block == offset) { | 766 | if (se->start_block == offset) { |
| 767 | if (bdev_p) | 767 | if (bdev_p) |
| 768 | *bdev_p = bdget(sis->bdev->bd_dev); | 768 | *bdev_p = bdgrab(sis->bdev); |
| 769 | 769 | ||
| 770 | spin_unlock(&swap_lock); | 770 | spin_unlock(&swap_lock); |
| 771 | bdput(bdev); | 771 | bdput(bdev); |