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.

5 files changed, 35 insertions, 35 deletions

diff --git a/fs/sysv/balloc.c b/fs/sysv/balloc.c
index f5240a75c..978bc2a91 100644
--- a/fs/sysv/balloc.c
+++ b/fs/sysv/balloc.c
@@ -83,7 +83,7 @@ void sysv_free_block(struct super_block * sb, unsigned int block)
 		}
 		*flc_count = *sb->sv_sb_flc_count; /* = sb->sv_flc_size */
 		memcpy(flc_blocks, sb->sv_sb_flc_blocks, *flc_count * sizeof(sysv_zone_t));
-		mark_buffer_dirty(bh, 1);
+		mark_buffer_dirty(bh);
 		mark_buffer_uptodate(bh, 1);
 		brelse(bh);
 		*sb->sv_sb_flc_count = 0;
@@ -100,7 +100,7 @@ void sysv_free_block(struct super_block * sb, unsigned int block)
 		}
 		memset(bh->b_data, 0, sb->sv_block_size);
 		/* this implies ((struct ..._freelist_chunk *) bh->b_data)->flc_count = 0; */
-		mark_buffer_dirty(bh, 1);
+		mark_buffer_dirty(bh);
 		mark_buffer_uptodate(bh, 1);
 		brelse(bh);
 		/* still *sb->sv_sb_flc_count = 0 */
@@ -119,8 +119,8 @@ void sysv_free_block(struct super_block * sb, unsigned int block)
 		  to_coh_ulong(from_coh_ulong(*sb->sv_sb_total_free_blocks) + 1);
 	else
 		*sb->sv_sb_total_free_blocks = *sb->sv_sb_total_free_blocks + 1;
-	mark_buffer_dirty(sb->sv_bh1, 1); /* super-block has been modified */
-	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2, 1);
+	mark_buffer_dirty(sb->sv_bh1); /* super-block has been modified */
+	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2);
 	sb->s_dirt = 1; /* and needs time stamp */
 	unlock_super(sb);
 }
@@ -207,7 +207,7 @@ int sysv_new_block(struct super_block * sb)
 		return 0;
 	}
 	memset(bh->b_data, 0, sb->sv_block_size);
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	mark_buffer_uptodate(bh, 1);
 	brelse(bh);
 	if (sb->sv_convert)
@@ -215,8 +215,8 @@ int sysv_new_block(struct super_block * sb)
 		  to_coh_ulong(from_coh_ulong(*sb->sv_sb_total_free_blocks) - 1);
 	else
 		*sb->sv_sb_total_free_blocks = *sb->sv_sb_total_free_blocks - 1;
-	mark_buffer_dirty(sb->sv_bh1, 1); /* super-block has been modified */
-	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2, 1);
+	mark_buffer_dirty(sb->sv_bh1); /* super-block has been modified */
+	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2);
 	sb->s_dirt = 1; /* and needs time stamp */
 	unlock_super(sb);
 	return block;
@@ -311,7 +311,7 @@ unsigned long sysv_count_free_blocks(struct super_block * sb)
 		printk("sysv_count_free_blocks: free block count was %d, correcting to %d\n",old_count,count);
 		if (!(sb->s_flags & MS_RDONLY)) {
 			*sb->sv_sb_total_free_blocks = (sb->sv_convert ? to_coh_ulong(count) : count);
-			mark_buffer_dirty(sb->sv_bh2, 1); /* super-block has been modified */
+			mark_buffer_dirty(sb->sv_bh2); /* super-block has been modified */
 			sb->s_dirt = 1; /* and needs time stamp */
 		}
 	}
diff --git a/fs/sysv/ialloc.c b/fs/sysv/ialloc.c
index bbd88336c..8469366cf 100644
--- a/fs/sysv/ialloc.c
+++ b/fs/sysv/ialloc.c
@@ -74,11 +74,11 @@ void sysv_free_inode(struct inode * inode)
 	if (*sb->sv_sb_fic_count < sb->sv_fic_size)
 		*sv_sb_fic_inode(sb,(*sb->sv_sb_fic_count)++) = ino;
 	(*sb->sv_sb_total_free_inodes)++;
-	mark_buffer_dirty(sb->sv_bh1, 1); /* super-block has been modified */
-	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2, 1);
+	mark_buffer_dirty(sb->sv_bh1); /* super-block has been modified */
+	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2);
 	sb->s_dirt = 1; /* and needs time stamp */
 	memset(raw_inode, 0, sizeof(struct sysv_inode));
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	unlock_super(sb);
 	brelse(bh);
 }
@@ -128,8 +128,8 @@ struct inode * sysv_new_inode(const struct inode * dir)
 	}
 	/* Now *sb->sv_sb_fic_count > 0. */
 	ino = *sv_sb_fic_inode(sb,--(*sb->sv_sb_fic_count));
-	mark_buffer_dirty(sb->sv_bh1, 1); /* super-block has been modified */
-	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2, 1);
+	mark_buffer_dirty(sb->sv_bh1); /* super-block has been modified */
+	if (sb->sv_bh1 != sb->sv_bh2) mark_buffer_dirty(sb->sv_bh2);
 	sb->s_dirt = 1; /* and needs time stamp */
 	inode->i_dev = sb->s_dev;
 	inode->i_uid = current->fsuid;
@@ -147,7 +147,7 @@ struct inode * sysv_new_inode(const struct inode * dir)
 	mark_inode_dirty(inode);	/* cleared by sysv_write_inode() */
 	/* That's it. */
 	(*sb->sv_sb_total_free_inodes)--;
-	mark_buffer_dirty(sb->sv_bh2, 1); /* super-block has been modified again */
+	mark_buffer_dirty(sb->sv_bh2); /* super-block has been modified again */
 	sb->s_dirt = 1; /* and needs time stamp again */
 	unlock_super(sb);
 	return inode;
@@ -185,7 +185,7 @@ unsigned long sysv_count_free_inodes(struct super_block * sb)
 		printk("sysv_count_free_inodes: free inode count was %d, correcting to %d\n",(short)(*sb->sv_sb_total_free_inodes),count);
 		if (!(sb->s_flags & MS_RDONLY)) {
 			*sb->sv_sb_total_free_inodes = count;
-			mark_buffer_dirty(sb->sv_bh2, 1); /* super-block has been modified */
+			mark_buffer_dirty(sb->sv_bh2); /* super-block has been modified */
 			sb->s_dirt = 1; /* and needs time stamp */
 		}
 	}
diff --git a/fs/sysv/inode.c b/fs/sysv/inode.c
index b7a1068ce..7e5f6c54a 100644
--- a/fs/sysv/inode.c
+++ b/fs/sysv/inode.c
@@ -532,7 +532,7 @@ static void sysv_write_super(struct super_block *sb)
 		if (sb->sv_convert)
 			time = to_coh_ulong(time);
 		*sb->sv_sb_time = time;
-		mark_buffer_dirty(sb->sv_bh2, 1);
+		mark_buffer_dirty(sb->sv_bh2);
 	}
 	sb->s_dirt = 0;
 }
@@ -769,7 +769,7 @@ repeat:
 		}
 		memset(result->b_data, 0, sb->sv_block_size);
 		mark_buffer_uptodate(result, 1);
-		mark_buffer_dirty(result, 1);
+		mark_buffer_dirty(result);
 	} else {
 		*phys = tmp;
 		*new = 1;
@@ -780,7 +780,7 @@ repeat:
 		goto repeat;
 	}
 	*p = (sb->sv_convert ? to_coh_ulong(block) : block);
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	*err = 0;
 out:
 	brelse(bh);
@@ -894,7 +894,7 @@ static struct buffer_head *sysv_getblk(struct inode *inode, unsigned int block,
 		if (buffer_new(&dummy)) {
 			memset(bh->b_data, 0, inode->i_sb->sv_block_size);
 			mark_buffer_uptodate(bh, 1);
-			mark_buffer_dirty(bh, 1);
+			mark_buffer_dirty(bh);
 		}
 		return bh;
 	}
@@ -1126,7 +1126,7 @@ static struct buffer_head * sysv_update_inode(struct inode * inode)
 	else
 		for (block = 0; block < 10+1+1+1; block++)
 			write3byte(&raw_inode->i_a.i_addb[3*block],inode->u.sysv_i.i_data[block]);
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	return bh;
 }
 
diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index 517371319..aba233768 100644
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -179,7 +179,7 @@ static int sysv_add_entry(struct inode * dir,
 			mark_inode_dirty(dir);
 			for (i = 0; i < SYSV_NAMELEN ; i++)
 				de->name[i] = (i < namelen) ? name[i] : 0;
-			mark_buffer_dirty(bh, 1);
+			mark_buffer_dirty(bh);
 			*res_dir = de;
 			break;
 		}
@@ -217,7 +217,7 @@ static int sysv_create(struct inode * dir, struct dentry * dentry, int mode)
 		return error;
 	}
 	de->inode = inode->i_ino;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 	d_instantiate(dentry, inode);
 	return 0;
@@ -251,7 +251,7 @@ static int sysv_mknod(struct inode * dir, struct dentry * dentry, int mode, int
 		return error;
 	}
 	de->inode = inode->i_ino;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 	d_instantiate(dentry, inode);
 	return 0;
@@ -292,7 +292,7 @@ static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode)
 	de->inode = dir->i_ino;
 	strcpy(de->name,".."); /* rest of de->name is zero, see sysv_new_block */
 	inode->i_nlink = 2;
-	mark_buffer_dirty(dir_block, 1);
+	mark_buffer_dirty(dir_block);
 	brelse(dir_block);
 	inode->i_mode = S_IFDIR | mode;
 	if (dir->i_mode & S_ISGID)
@@ -306,7 +306,7 @@ static int sysv_mkdir(struct inode * dir, struct dentry *dentry, int mode)
 		return error;
 	}
 	de->inode = inode->i_ino;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	dir->i_nlink++;
 	mark_inode_dirty(dir);
 	brelse(bh);
@@ -392,7 +392,7 @@ static int sysv_rmdir(struct inode * dir, struct dentry * dentry)
 	if (inode->i_nlink != 2)
 		printk("empty directory has nlink!=2 (%d)\n", inode->i_nlink);
 	de->inode = 0;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	inode->i_nlink=0;
 	dir->i_nlink--;
 	inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
@@ -422,7 +422,7 @@ static int sysv_unlink(struct inode * dir, struct dentry * dentry)
 		inode->i_nlink=1;
 	}
 	de->inode = 0;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	dir->i_ctime = dir->i_mtime = CURRENT_TIME;
 	mark_inode_dirty(dir);
 	inode->i_nlink--;
@@ -463,7 +463,7 @@ static int sysv_symlink(struct inode * dir, struct dentry * dentry,
 	if (err)
 		goto out_no_entry;
 	de->inode = inode->i_ino;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	brelse(bh);
         d_instantiate(dentry, inode);
 out:
@@ -502,7 +502,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir,
 		return error;
 	}
 	de->inode = oldinode->i_ino;
-	mark_buffer_dirty(bh, 1);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 	oldinode->i_nlink++;
 	oldinode->i_ctime = CURRENT_TIME;
@@ -578,11 +578,11 @@ static int sysv_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, 1);
-	mark_buffer_dirty(new_bh, 1);
+	mark_buffer_dirty(old_bh);
+	mark_buffer_dirty(new_bh);
 	if (dir_bh) {
 		PARENT_INO(dir_bh->b_data) = new_dir->i_ino;
-		mark_buffer_dirty(dir_bh, 1);
+		mark_buffer_dirty(dir_bh);
 		old_dir->i_nlink--;
 		mark_inode_dirty(old_dir);
 		if (new_inode) {
diff --git a/fs/sysv/truncate.c b/fs/sysv/truncate.c
index 32bfccf6d..559af828d 100644
--- a/fs/sysv/truncate.c
+++ b/fs/sysv/truncate.c
@@ -124,7 +124,7 @@ repeat:
 			continue;
 		}
 		*ind = 0;
-		mark_buffer_dirty(indbh, 1);
+		mark_buffer_dirty(indbh);
 		brelse(bh);
 		sysv_free_block(sb,block);
 	}
@@ -183,7 +183,7 @@ static int trunc_dindirect(struct inode * inode, unsigned long offset, sysv_zone
 			continue;
 		retry |= trunc_indirect(inode,offset+(i<<sb->sv_ind_per_block_bits),ind,sb->sv_convert,&dirty);
 		if (dirty)
-			mark_buffer_dirty(indbh, 1);
+			mark_buffer_dirty(indbh);
 	}
 	for (i = 0; i < sb->sv_ind_per_block; i++)
 		if (((sysv_zone_t *) indbh->b_data)[i])
@@ -240,7 +240,7 @@ static int trunc_tindirect(struct inode * inode, unsigned long offset, sysv_zone
 			continue;
 		retry |= trunc_dindirect(inode,offset+(i<<sb->sv_ind_per_block_2_bits),ind,sb->sv_convert,&dirty);
 		if (dirty)
-			mark_buffer_dirty(indbh, 1);
+			mark_buffer_dirty(indbh);
 	}
 	for (i = 0; i < sb->sv_ind_per_block; i++)
 		if (((sysv_zone_t *) indbh->b_data)[i])