From mboxrd@z Thu Jan 1 00:00:00 1970 From: clameter@sgi.com Subject: [21/37] Use page_cache_xxx in drivers/block/loop.c Date: Wed, 20 Jun 2007 11:29:28 -0700 Message-ID: <20070620183010.870024277@sgi.com> References: <20070620182907.506775016@sgi.com> Cc: Christoph Hellwig , Mel Gorman To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Return-path: Received: from netops-testserver-4-out.sgi.com ([192.48.171.29]:46752 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757361AbXFTSaL (ORCPT ); Wed, 20 Jun 2007 14:30:11 -0400 Cc: William Lee Irwin III , David Chinner Cc: Jens Axboe , Badari Pulavarty Cc: Maxim Levitsky Content-Disposition: inline; filename=vps_drivers_block_loop Sender: linux-fsdevel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Signed-off-by: Christoph Lameter --- drivers/block/loop.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) Index: linux-2.6.22-rc4-mm2/drivers/block/loop.c =================================================================== --- linux-2.6.22-rc4-mm2.orig/drivers/block/loop.c 2007-06-19 20:50:30.000000000 -0700 +++ linux-2.6.22-rc4-mm2/drivers/block/loop.c 2007-06-20 00:34:46.000000000 -0700 @@ -215,8 +215,8 @@ static int do_lo_send_aops(struct loop_d int len, ret; mutex_lock(&mapping->host->i_mutex); - index = pos >> PAGE_CACHE_SHIFT; - offset = pos & ((pgoff_t)PAGE_CACHE_SIZE - 1); + index = page_cache_index(mapping, pos); + offset = page_cache_offset(mapping, pos); bv_offs = bvec->bv_offset; len = bvec->bv_len; while (len > 0) { @@ -226,8 +226,9 @@ static int do_lo_send_aops(struct loop_d struct page *page; void *fsdata; - IV = ((sector_t)index << (PAGE_CACHE_SHIFT - 9))+(offset >> 9); - size = PAGE_CACHE_SIZE - offset; + IV = ((sector_t)index << (page_cache_shift(mapping) - 9)) + + (offset >> 9); + size = page_cache_size(mapping) - offset; if (size > len) size = len; @@ -393,7 +394,9 @@ lo_read_actor(read_descriptor_t *desc, s struct loop_device *lo = p->lo; sector_t IV; - IV = ((sector_t) page->index << (PAGE_CACHE_SHIFT - 9))+(offset >> 9); + IV = ((sector_t) page->index << + (page_cache_shift(page_mapping(page)) - 9)) + + (offset >> 9); if (size > count) size = count; --