patch-2.2.15 linux/fs/block_dev.c

• Lines: 20
• Date: Fri Apr 21 12:46:41 2000
• Orig file: v2.2.14/fs/block_dev.c
• Orig date: Tue Jan 4 21:19:00 2000

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/fs/block_dev.c linux/fs/block_dev.c
@@ -92,6 +92,7 @@
 		      blocks = read_ahead[MAJOR(dev)] / (blocksize >> 9) / 2;
 		      if (block + blocks > size) blocks = size - block;
 		      if (blocks > NBUF) blocks=NBUF;
+		      if (!blocks) blocks = 1;
 		      for(i=1; i<blocks; i++)
 		      {
 		        bhlist[i] = getblk (dev, block+i, blocksize);
@@ -105,8 +106,10 @@
 		    ll_rw_block(READ, blocks, bhlist);
 		    for(i=1; i<blocks; i++) brelse(bhlist[i]);
 		    wait_on_buffer(bh);
-		    if (!buffer_uptodate(bh))
+		    if (!buffer_uptodate(bh)) {
+			  brelse(bh);
 			  return written ? written : -EIO;
+		    }
 		  };
 		};
 #endif