patch-1.3.45 linux/fs/ext2/inode.c

Next file: linux/fs/ext2/namei.c
Previous file: linux/fs/ext2/fsync.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.44/linux/fs/ext2/inode.c linux/fs/ext2/inode.c
@@ -102,7 +102,7 @@
 			return 0;
 		}
 		memset(bh->b_data, 0, inode->i_sb->s_blocksize);
-		bh->b_uptodate = 1;
+		mark_buffer_uptodate(bh, 1);
 		mark_buffer_dirty(bh, 1);
 		brelse (bh);
 	} else {
@@ -258,10 +258,10 @@
 
 	if (!bh)
 		return NULL;
-	if (!bh->b_uptodate) {
+	if (!buffer_uptodate(bh)) {
 		ll_rw_block (READ, 1, &bh);
 		wait_on_buffer (bh);
-		if (!bh->b_uptodate) {
+		if (!buffer_uptodate(bh)) {
 			brelse (bh);
 			return NULL;
 		}
@@ -477,11 +477,11 @@
 	struct buffer_head * bh;
 
 	bh = ext2_getblk (inode, block, create, err);
-	if (!bh || bh->b_uptodate)
+	if (!bh || buffer_uptodate(bh))
 		return bh;
 	ll_rw_block (READ, 1, &bh);
 	wait_on_buffer (bh);
-	if (bh->b_uptodate)
+	if (buffer_uptodate(bh))
 		return bh;
 	brelse (bh);
 	*err = -EIO;
@@ -655,11 +655,11 @@
 	struct buffer_head *bh;
 
 	bh = ext2_update_inode (inode);
-	if (bh && bh->b_dirt)
+	if (bh && buffer_dirty(bh))
 	{
 		ll_rw_block (WRITE, 1, &bh);
 		wait_on_buffer (bh);
-		if (bh->b_req && !bh->b_uptodate)
+		if (buffer_req(bh) && !buffer_uptodate(bh))
 		{
 			printk ("IO error syncing ext2 inode ["
 				"%s:%08lx]\n",

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