--- linux/fs/ext/file.c	2018/04/24 18:12:18	1.1.1.2
+++ linux/fs/ext/file.c	2018/04/24 18:14:17	1.1.1.3
@@ -30,6 +30,14 @@
 #include <linux/fs.h>
 #include <linux/ext_fs.h>
 
+static inline void wait_on_buffer(struct buffer_head * bh)
+{
+	cli();
+	while (bh->b_lock)
+		sleep_on(&bh->b_wait);
+	sti();
+}
+
 static int ext_file_read(struct inode *, struct file *, char *, int);
 static int ext_file_write(struct inode *, struct file *, char *, int);
 
@@ -65,17 +73,9 @@ struct inode_operations ext_file_inode_o
 	ext_truncate		/* truncate */
 };
 
-static inline void wait_on_buffer(struct buffer_head * bh)
-{
-	cli();
-	while (bh->b_lock)
-		sleep_on(&bh->b_wait);
-	sti();
-}
-
 static int ext_file_read(struct inode * inode, struct file * filp, char * buf, int count)
 {
-	int read,left,chars,nr;
+	int read,left,chars;
 	int block, blocks, offset;
 	struct buffer_head ** bhb, ** bhe;
 	struct buffer_head * buflist[NBUF];
@@ -104,12 +104,9 @@ static int ext_file_read(struct inode *
 	do {
 		if (blocks) {
 			--blocks;
-			if (nr = ext_bmap(inode,block++)) {
-				*bhb = getblk(inode->i_dev, nr, BLOCK_SIZE);
-				if (!(*bhb)->b_uptodate)
-					ll_rw_block(READ,*bhb);
-			} else
-				*bhb = NULL;
+			*bhb = ext_getblk(inode,block++,0);
+			if (*bhb && !(*bhb)->b_uptodate)
+				ll_rw_block(READ,*bhb);
 
 			if (++bhb == &buflist[NBUF])
 				bhb = buflist;
@@ -160,7 +157,7 @@ static int ext_file_read(struct inode *
 static int ext_file_write(struct inode * inode, struct file * filp, char * buf, int count)
 {
 	off_t pos;
-	int written,block,c;
+	int written,c;
 	struct buffer_head * bh;
 	char * p;
 
@@ -182,7 +179,8 @@ static int ext_file_write(struct inode *
 		pos = filp->f_pos;
 	written = 0;
 	while (written<count) {
-		if (!(block = ext_create_block(inode,pos/BLOCK_SIZE))) {
+		bh = ext_getblk(inode,pos/BLOCK_SIZE,1);
+		if (!bh) {
 			if (!written)
 				written = -ENOSPC;
 			break;
@@ -190,14 +188,15 @@ static int ext_file_write(struct inode *
 		c = BLOCK_SIZE - (pos % BLOCK_SIZE);
 		if (c > count-written)
 			c = count-written;
-		if (c == BLOCK_SIZE)
-			bh = getblk(inode->i_dev, block, BLOCK_SIZE);
-		else
-			bh = bread(inode->i_dev, block, BLOCK_SIZE);
-		if (!bh) {
-			if (!written)
-				written = -EIO;
-			break;
+		if (c != BLOCK_SIZE && !bh->b_uptodate) {
+			ll_rw_block(READ,bh);
+			wait_on_buffer(bh);
+			if (!bh->b_uptodate) {
+				brelse(bh);
+				if (!written)
+					written = -EIO;
+				break;
+			}
 		}
 		p = (pos % BLOCK_SIZE) + bh->b_data;
 		pos += c;