Merge with Linux 2.4.0-test9. Please check DECstation, I had a number

of rejects to fixup while integrating Linus patches.  I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages.  I commit this anyway
since I found that the last CVS versions had the same problem.

3 files changed, 12 insertions, 12 deletions

diff --git a/fs/bfs/dir.c b/fs/bfs/dir.c
index 721739e31..9ebea1ca7 100644
--- a/fs/bfs/dir.c
+++ b/fs/bfs/dir.c
@@ -177,7 +177,7 @@ static int bfs_unlink(struct inode * dir, struct dentry * dentry)
 	}
 	de->ino = 0;
 	dir->i_version = ++event;
-	mark_buffer_dirty(bh, 0);
+	mark_buffer_dirty(bh);
 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
 	mark_inode_dirty(dir);
 	inode->i_nlink--;
@@ -236,7 +236,7 @@ static int bfs_rename(struct inode * old_dir, struct dentry * old_dentry,
 		new_inode->i_ctime = CURRENT_TIME;
 		mark_inode_dirty(new_inode);
 	}
-	mark_buffer_dirty(old_bh, 0);
+	mark_buffer_dirty(old_bh);
 	error = 0;
 
 end_rename:
@@ -288,7 +288,7 @@ static int bfs_add_entry(struct inode * dir, const char * name, int namelen, int
 				de->ino = ino;
 				for (i=0; i<BFS_NAMELEN; i++)
 					de->name[i] = (i < namelen) ? name[i] : 0;
-				mark_buffer_dirty(bh, 0);
+				mark_buffer_dirty(bh);
 				brelse(bh);
 				return 0;
 			}
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 1335d301b..1da12e6ae 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -33,7 +33,7 @@ static int bfs_move_block(unsigned long from, unsigned long to, kdev_t dev)
 		return -EIO;
 	new = getblk(dev, to, BFS_BSIZE);
 	memcpy(new->b_data, bh->b_data, bh->b_size);
-	mark_buffer_dirty(new, 0);
+	mark_buffer_dirty(new);
 	bforget(bh);
 	brelse(new);
 	return 0;
@@ -98,7 +98,7 @@ static int bfs_get_block(struct inode * inode, long block,
 		bh_result->b_state |= (1UL << BH_Mapped);
 		s->su_lf_eblk = inode->iu_eblock = inode->iu_sblock + block;
 		mark_inode_dirty(inode);
-		mark_buffer_dirty(s->su_sbh, 1);
+		mark_buffer_dirty(s->su_sbh);
 		err = 0;
 		goto out;
 	}
@@ -118,7 +118,7 @@ static int bfs_get_block(struct inode * inode, long block,
 	inode->iu_sblock = next_free_block;
 	s->su_lf_eblk = inode->iu_eblock = next_free_block + block;
 	mark_inode_dirty(inode);
-	mark_buffer_dirty(s->su_sbh, 1);
+	mark_buffer_dirty(s->su_sbh);
 	bh_result->b_dev = inode->i_dev;
 	bh_result->b_blocknr = inode->iu_sblock + block;
 	bh_result->b_state |= (1UL << BH_Mapped);
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c
index 9f53cbcd3..fe1396497 100644
--- a/fs/bfs/inode.c
+++ b/fs/bfs/inode.c
@@ -127,7 +127,7 @@ static void bfs_write_inode(struct inode * inode, int unused)
 	di->i_eblock = inode->iu_eblock;
 	di->i_eoffset = di->i_sblock * BFS_BSIZE + inode->i_size - 1;
 
-	mark_buffer_dirty(bh, 0);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 	unlock_kernel();
 }
@@ -169,7 +169,7 @@ static void bfs_delete_inode(struct inode * inode)
 	}
 	di->i_ino = 0;
 	di->i_sblock = 0;
-	mark_buffer_dirty(bh, 0);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 
 	/* if this was the last file, make the previous 
@@ -177,7 +177,7 @@ static void bfs_delete_inode(struct inode * inode)
 	   saves us 1 gap */
 	if (s->su_lf_eblk == inode->iu_eblock) {
 		s->su_lf_eblk = inode->iu_sblock - 1;
-		mark_buffer_dirty(s->su_sbh, 1);
+		mark_buffer_dirty(s->su_sbh);
 	}
 	unlock_kernel();
 	clear_inode(inode);
@@ -197,7 +197,7 @@ static int bfs_statfs(struct super_block *s, struct statfs *buf)
 	buf->f_bfree = buf->f_bavail = s->su_freeb;
 	buf->f_files = s->su_lasti + 1 - BFS_ROOT_INO;
 	buf->f_ffree = s->su_freei;
-	buf->f_fsid.val[0] = s->s_dev;
+	buf->f_fsid.val[0] = kdev_t_to_nr(s->s_dev);
 	buf->f_namelen = BFS_NAMELEN;
 	return 0;
 }
@@ -205,7 +205,7 @@ static int bfs_statfs(struct super_block *s, struct statfs *buf)
 static void bfs_write_super(struct super_block *s)
 {
 	if (!(s->s_flags & MS_RDONLY))
-		mark_buffer_dirty(s->su_sbh, 1);
+		mark_buffer_dirty(s->su_sbh);
 	s->s_dirt = 0;
 }
 
@@ -314,7 +314,7 @@ static struct super_block * bfs_read_super(struct super_block * s,
 		iput(inode);
 	}
 	if (!(s->s_flags & MS_RDONLY)) {
-		mark_buffer_dirty(bh, 1);
+		mark_buffer_dirty(bh);
 		s->s_dirt = 1;
 	} 
 	dump_imap("read_super", s);