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

Next file: linux/include/asm-alpha/bitops.h
Previous file: linux/fs/xiafs/fsync.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v1.3.44/linux/fs/xiafs/inode.c linux/fs/xiafs/inode.c
@@ -280,10 +280,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;
 	}
@@ -359,11 +359,11 @@
     struct buffer_head * bh;
 
     bh = xiafs_getblk(inode, zone, create);
-    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);
     return NULL;
@@ -494,11 +494,11 @@
     struct buffer_head *bh;
 
     bh = xiafs_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 xiafs inode [%s:%lu]\n",
 		    kdevname(inode->i_dev), inode->i_ino);

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