diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /mm/swapfile.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'mm/swapfile.c')
| -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 7e6304dfafab..312fafe0ab6e 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c | |||
| @@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) | |||
| 635 | 635 | ||
| 636 | if (!bdev) { | 636 | if (!bdev) { |
| 637 | if (bdev_p) | 637 | if (bdev_p) |
| 638 | *bdev_p = sis->bdev; | 638 | *bdev_p = bdget(sis->bdev->bd_dev); |
| 639 | 639 | ||
| 640 | spin_unlock(&swap_lock); | 640 | spin_unlock(&swap_lock); |
| 641 | return i; | 641 | return i; |
| @@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) | |||
| 647 | struct swap_extent, list); | 647 | struct swap_extent, list); |
| 648 | if (se->start_block == offset) { | 648 | if (se->start_block == offset) { |
| 649 | if (bdev_p) | 649 | if (bdev_p) |
| 650 | *bdev_p = sis->bdev; | 650 | *bdev_p = bdget(sis->bdev->bd_dev); |
| 651 | 651 | ||
| 652 | spin_unlock(&swap_lock); | 652 | spin_unlock(&swap_lock); |
| 653 | bdput(bdev); | 653 | bdput(bdev); |