Bug fixed in block_read_func

chenall · Jan 14, 2015 · ad8c813 · ad8c813
1 parent f1bc267
commit ad8c813
Showing 1 changed file with 20 additions and 38 deletions.
diff --git a/stage2/disk_io.c b/stage2/disk_io.c
@@ -2181,11 +2181,11 @@ grub_open (char *filename)
 unsigned long long
 block_read_func (unsigned long long buf, unsigned long long len, unsigned long write)
 {
-          unsigned long long ret = 0;
-      unsigned long size;
-      unsigned long off;
+	unsigned long long ret = 0;
+	unsigned long size;
+	unsigned long off;
 
-      while (len && !errnum)
+	while (len && !errnum)
 	{
 	  /* we may need to look for the right block in the list(s) */
 	  //if (filepos < (*((unsigned long*)FSYS_BUF)) /* BLK_CUR_FILEPOS */)
@@ -2198,48 +2198,30 @@ block_read_func (unsigned long long buf, unsigned long long len, unsigned long w
 	      blk_buf.cur_blklist = blk_buf.blklist;
 	      blk_buf.cur_blknum = 0;
 	    }
-	    else if (filepos > blk_buf.cur_filepos)
+
+	     if (filepos > blk_buf.cur_filepos)
 	    {
-		unsigned long sector_size;
+		unsigned long long i;
 		unsigned long long tmp;
 
-		sector_size = buf_geom.sector_size;
-		tmp = filepos - (blk_buf.cur_filepos & -(unsigned long long)sector_size);
-
-/*		if (blk_sector_bit)//这个和下面的注释主要是考虑到其它情况,不过应该是不需要.
-		{	*/
-			unsigned long long i;
-
-			tmp >>= blk_sector_bit;
+		tmp = filepos - (blk_buf.cur_filepos & -(unsigned long long)buf_geom.sector_size);
+		tmp >>= blk_sector_bit;
 
-			while(tmp)
+		while(tmp)
+		{
+			i = blk_buf.cur_blklist->length - blk_buf.cur_blknum;
+			if (i > tmp)
 			{
-				i = blk_buf.cur_blklist->length - blk_buf.cur_blknum;
-				if (i > tmp)
-				{
-					blk_buf.cur_blknum += tmp;
-					break;
-				}
-				else
-				{
-					tmp -= i;
-					blk_buf.cur_blklist++;
-					blk_buf.cur_blknum = 0;
-				}
+				blk_buf.cur_blknum += tmp;
+				break;
 			}
-		/*}
-		else
-		{
-			while (tmp >= sector_size )
+			else
 			{
-				tmp -= sector_size;
-				if (++blk_buf.cur_blknum >= blk_buf.cur_blklist->length )
-				{
-					blk_buf.cur_blklist++;
-					blk_buf.cur_blknum = 0;
-				}
+				tmp -= i;
+				blk_buf.cur_blklist++;
+				blk_buf.cur_blknum = 0;
 			}
-		}*/
+		}
 
 		blk_buf.cur_filepos = filepos;
 	    }