X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=block%2Fpartition-generic.c;h=d7eb77e1e3a8f4be13f6016ed0e7f7ab7c051da8;hb=8358b02bf67d3a5d8a825070e1aa73f25fb2e4c7;hp=84c53f04777a7536d7d0ed9ee519034afa4c74b3;hpb=b30a337ca27c4f40439e4bfb290cba5f88d73bb7;p=deliverable%2Flinux.git

diff --git a/block/partition-generic.c b/block/partition-generic.c
index 84c53f04777a..d7eb77e1e3a8 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -573,8 +573,8 @@ static struct page *read_pagecache_sector(struct block_device *bdev, sector_t n)
 {
 	struct address_space *mapping = bdev->bd_inode->i_mapping;
 
-	return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_CACHE_SHIFT-9)),
-			NULL);
+	return read_mapping_page(mapping, (pgoff_t)(n >> (PAGE_SHIFT-9)),
+				 NULL);
 }
 
 unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
@@ -591,9 +591,9 @@ unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
 		if (PageError(page))
 			goto fail;
 		p->v = page;
-		return (unsigned char *)page_address(page) +  ((n & ((1 << (PAGE_CACHE_SHIFT - 9)) - 1)) << 9);
+		return (unsigned char *)page_address(page) +  ((n & ((1 << (PAGE_SHIFT - 9)) - 1)) << 9);
 fail:
-		page_cache_release(page);
+		put_page(page);
 	}
 	p->v = NULL;
 	return NULL;