From 56c74aef388248d19348ecd85bf45a6f68d42aaa Mon Sep 17 00:00:00 2001 From: Jan Kara Date: Mon, 4 Oct 2010 11:37:37 +0200 Subject: [PATCH] --- yaml --- r: 217775 b: refs/heads/master c: fde214d414218fb6cace35708730986bcc94fb53 h: refs/heads/master i: 217773: 0fb53fb2562fae7b925734bcbefa9c6b1077ba09 217771: 0327e0d7d965f6657f0d200c6a6821ce3ec1f8e8 217767: 140b04f11bcd8dfc06be46b3b94757811b6bdb86 217759: 50fd50a8802dc1f3ac3c59ea9f5cc6ee0efd4f97 v: v3 --- [refs] | 2 +- trunk/fs/isofs/inode.c | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 68456bfebae7..a9ae78a9796b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebdec241d509cf69f6ebf1ecdc036359d3dbe154 +refs/heads/master: fde214d414218fb6cace35708730986bcc94fb53 diff --git a/trunk/fs/isofs/inode.c b/trunk/fs/isofs/inode.c index 09ff41a752a0..60c2b944d762 100644 --- a/trunk/fs/isofs/inode.c +++ b/trunk/fs/isofs/inode.c @@ -962,25 +962,23 @@ static int isofs_statfs (struct dentry *dentry, struct kstatfs *buf) * or getblk() if they are not. Returns the number of blocks inserted * (-ve == error.) */ -int isofs_get_blocks(struct inode *inode, sector_t iblock_s, +int isofs_get_blocks(struct inode *inode, sector_t iblock, struct buffer_head **bh, unsigned long nblocks) { - unsigned long b_off; + unsigned long b_off = iblock; unsigned offset, sect_size; unsigned int firstext; unsigned long nextblk, nextoff; - long iblock = (long)iblock_s; int section, rv, error; struct iso_inode_info *ei = ISOFS_I(inode); error = -EIO; rv = 0; - if (iblock < 0 || iblock != iblock_s) { + if (iblock != b_off) { printk(KERN_DEBUG "%s: block number too large\n", __func__); goto abort; } - b_off = iblock; offset = 0; firstext = ei->i_first_extent; @@ -998,8 +996,9 @@ int isofs_get_blocks(struct inode *inode, sector_t iblock_s, * I/O errors. */ if (b_off > ((inode->i_size + PAGE_CACHE_SIZE - 1) >> ISOFS_BUFFER_BITS(inode))) { - printk(KERN_DEBUG "%s: block >= EOF (%ld, %ld)\n", - __func__, iblock, (unsigned long) inode->i_size); + printk(KERN_DEBUG "%s: block >= EOF (%lu, %llu)\n", + __func__, b_off, + (unsigned long long)inode->i_size); goto abort; } @@ -1025,9 +1024,9 @@ int isofs_get_blocks(struct inode *inode, sector_t iblock_s, if (++section > 100) { printk(KERN_DEBUG "%s: More than 100 file sections ?!?" " aborting...\n", __func__); - printk(KERN_DEBUG "%s: block=%ld firstext=%u sect_size=%u " + printk(KERN_DEBUG "%s: block=%lu firstext=%u sect_size=%u " "nextblk=%lu nextoff=%lu\n", __func__, - iblock, firstext, (unsigned) sect_size, + b_off, firstext, (unsigned) sect_size, nextblk, nextoff); goto abort; }