patch-1.3.71 linux/fs/block_dev.c

Next file: linux/fs/buffer.c
Previous file: linux/fs/binfmt_script.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.70/linux/fs/block_dev.c linux/fs/block_dev.c
@@ -61,11 +61,8 @@
 	else
 		size = INT_MAX;
 	while (count>0) {
-		if (block >= size) {
-			if (!written)
-				written = -ENOSPC;
-			return written;
-		}
+		if (block >= size)
+			return written ? written : -ENOSPC;
 		chars = blocksize - offset;
 		if (chars > count)
 			chars=count;
@@ -105,7 +102,7 @@
 		      bhlist[i] = getblk (dev, block+i, blocksize);
 		      if(!bhlist[i]){
 			while(i >= 0) brelse(bhlist[i--]);
-			return written? written: -EIO;
+			return written ? written : -EIO;
 		      };
 		    };
 		    ll_rw_block(READ, blocks, bhlist);
@@ -117,7 +114,7 @@
 #endif
 		block++;
 		if (!bh)
-			return written?written:-EIO;
+			return written ? written : -EIO;
 		p = offset + bh->b_data;
 		offset = 0;
 		filp->f_pos += chars;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov with Sam's (original) version
of this