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.

6 files changed, 24 insertions, 24 deletions

diff --git a/fs/affs/amigaffs.c b/fs/affs/amigaffs.c
index d01f618c8..5c4ec8e6b 100644
--- a/fs/affs/amigaffs.c
+++ b/fs/affs/amigaffs.c
@@ -79,7 +79,7 @@ affs_insert_hash(unsigned long next, struct buffer_head *file, struct inode *ino
 	DIR_END(file->b_data,inode)->hash_chain = cpu_to_be32(next);
 	((s32 *)bh->b_data)[offset]             = cpu_to_be32(ino);
 	affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-	mark_buffer_dirty(bh,1);
+	mark_buffer_dirty(bh);
 	affs_brelse(bh);
 
 	return 0;
@@ -130,7 +130,7 @@ affs_remove_hash(struct buffer_head *dbh, struct inode *inode)
 		if (ownkey == key) {
 			((s32 *)bh->b_data)[offset] = FILE_END(dbh->b_data,inode)->hash_chain;
 			affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 			affs_brelse(bh);
 			retval = 0;
 			break;
@@ -178,7 +178,7 @@ affs_remove_link(struct buffer_head *dbh, struct inode *inode)
 			FILE_END(bh->b_data,inode)->link_chain =
 						FILE_END(dbh->b_data,inode)->link_chain;
 			affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 			affs_brelse(bh);
 			retval = 0;
 			break;
@@ -261,7 +261,7 @@ affs_remove_header(struct buffer_head *bh, struct inode *inode)
 			return error;
 		}
 		affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-		mark_buffer_dirty(bh,1);
+		mark_buffer_dirty(bh);
 		affs_brelse(link_bh);
 		affs_free_block(inode->i_sb,link_ino);
 		/* Mark the link's parent dir as changed, too. */
diff --git a/fs/affs/bitmap.c b/fs/affs/bitmap.c
index 3382a82f9..de477b331 100644
--- a/fs/affs/bitmap.c
+++ b/fs/affs/bitmap.c
@@ -93,7 +93,7 @@ affs_free_block(struct super_block *sb, s32 block)
 	else {
 		sb->u.affs_sb.s_alloc[zone_no].az_free++;
 		((u32 *)bm->bm_bh->b_data)[0] = cpu_to_be32(be32_to_cpu(((u32 *)bm->bm_bh->b_data)[0]) - blk);
-		mark_buffer_dirty(bm->bm_bh,1);
+		mark_buffer_dirty(bm->bm_bh);
 		sb->s_dirt = 1;
 	}
 	if (--bm->bm_count == 0) {
@@ -176,7 +176,7 @@ found:
 	w     = ~w - be32_to_cpu(bm[i]);
 	bm[0] = cpu_to_be32(be32_to_cpu(bm[0]) + w);
 	unlock_super(sb);
-	mark_buffer_dirty(zone->z_bm->bm_bh,1);
+	mark_buffer_dirty(zone->z_bm->bm_bh);
 	sb->s_dirt = 1;
 	zone->z_lru_time = jiffies;
 
diff --git a/fs/affs/file.c b/fs/affs/file.c
index cd31491b0..de0808b9e 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -447,12 +447,12 @@ static struct buffer_head * affs_getblock(struct inode *inode, s32 block)
 				DATA_FRONT(ebh)->header_key      = cpu_to_be32(inode->i_ino);
 				DATA_FRONT(ebh)->sequence_number = cpu_to_be32(inode->u.affs_i.i_lastblock + 1);
 				affs_fix_checksum(AFFS_I2BSIZE(inode), ebh->b_data, 5);
-				mark_buffer_dirty(ebh, 0);
+				mark_buffer_dirty(ebh);
 				if (pbh) {
 					DATA_FRONT(pbh)->data_size = cpu_to_be32(AFFS_I2BSIZE(inode) - 24);
 					DATA_FRONT(pbh)->next_data = cpu_to_be32(nkey);
 					affs_fix_checksum(AFFS_I2BSIZE(inode),pbh->b_data,5);
-					mark_buffer_dirty(pbh,0);
+					mark_buffer_dirty(pbh);
 					affs_brelse(pbh);
 				}
 				pbh = ebh;
@@ -466,7 +466,7 @@ static struct buffer_head * affs_getblock(struct inode *inode, s32 block)
 				fdp->first_data = AFFS_BLOCK(bh->b_data,inode,0);
 			fdp->block_count = cpu_to_be32(j);
 			affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 		}
 
 		if (block < j) {
@@ -495,10 +495,10 @@ static struct buffer_head * affs_getblock(struct inode *inode, s32 block)
 			FILE_END(ebh->b_data,inode)->secondary_type      = cpu_to_be32(ST_FILE);
 			FILE_END(ebh->b_data,inode)->parent              = cpu_to_be32(inode->i_ino);
 			affs_fix_checksum(AFFS_I2BSIZE(inode),ebh->b_data,5);
-			mark_buffer_dirty(ebh, 1);
+			mark_buffer_dirty(ebh);
 			FILE_END(bh->b_data,inode)->extension = cpu_to_be32(key);
 			affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 			affs_brelse(bh);
 			bh = ebh;
 		}
@@ -678,7 +678,7 @@ affs_truncate(struct inode *inode)
 			rem = do_div(tmp, net_blocksize);
 			DATA_FRONT(bh)->data_size = cpu_to_be32(rem ? rem : net_blocksize);
 			affs_fix_checksum(blocksize,bh->b_data,5);
-			mark_buffer_dirty(bh,0);
+			mark_buffer_dirty(bh);
 		}
 		goto out_truncate;
 	}
@@ -733,7 +733,7 @@ affs_truncate(struct inode *inode)
 			first = 0;
 			*keyp = 0;
 			affs_fix_checksum(blocksize,bh->b_data,5);
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 		} else
 			first -= AFFS_I2HSIZE(inode);
 		affs_brelse(bh);
@@ -766,7 +766,7 @@ affs_truncate(struct inode *inode)
 				((struct data_front *)bh->b_data)->next_data = 0;
 				affs_fix_checksum(blocksize,bh->b_data,5);
 			}
-			mark_buffer_dirty(bh,1);
+			mark_buffer_dirty(bh);
 		} else 
 			affs_error(inode->i_sb,"truncate","Cannot read block %d",block);
 	}
diff --git a/fs/affs/inode.c b/fs/affs/inode.c
index f98a2cd0b..2f8c36aa5 100644
--- a/fs/affs/inode.c
+++ b/fs/affs/inode.c
@@ -232,7 +232,7 @@ affs_write_inode(struct inode *inode, int unused)
 		}
 	}
 	affs_fix_checksum(AFFS_I2BSIZE(inode),bh->b_data,5);
-	mark_buffer_dirty(bh,1);
+	mark_buffer_dirty(bh);
 	brelse(bh);
 	unlock_kernel();
 }
@@ -392,7 +392,7 @@ affs_add_entry(struct inode *dir, struct inode *link, struct inode *inode,
 		affs_fix_checksum(AFFS_I2BSIZE(link),link_bh->b_data,5);
 		link->i_version = ++event;
 		mark_inode_dirty(link);
-		mark_buffer_dirty(link_bh,1);
+		mark_buffer_dirty(link_bh);
 	}
 	affs_fix_checksum(AFFS_I2BSIZE(inode),inode_bh->b_data,5);
 	affs_fix_checksum(AFFS_I2BSIZE(dir),dir_bh->b_data,5);
@@ -402,8 +402,8 @@ affs_add_entry(struct inode *dir, struct inode *link, struct inode *inode,
 
 	mark_inode_dirty(dir);
 	mark_inode_dirty(inode);
-	mark_buffer_dirty(dir_bh,1);
-	mark_buffer_dirty(inode_bh,1);
+	mark_buffer_dirty(dir_bh);
+	mark_buffer_dirty(inode_bh);
 
 addentry_done:
 	affs_brelse(dir_bh);
diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index 8ad7b07a2..a73e60618 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -440,7 +440,7 @@ affs_symlink(struct inode *dir, struct dentry *dentry, const char *symname)
 				symname++;
 	}
 	*p = 0;
-	mark_buffer_dirty(bh,1);
+	mark_buffer_dirty(bh);
 	affs_brelse(bh);
 	mark_inode_dirty(inode);
 
@@ -592,7 +592,7 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
 	retval             = 0;
 	mark_inode_dirty(new_dir);
 	mark_inode_dirty(old_dir);
-	mark_buffer_dirty(old_bh,1);
+	mark_buffer_dirty(old_bh);
 	
 end_rename:
 	affs_brelse(old_bh);
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 46c11a8e2..32ad74eb9 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -52,7 +52,7 @@ affs_put_super(struct super_block *sb)
 		secs_to_datestamp(CURRENT_TIME,
 				  &ROOT_END_S(sb->u.affs_sb.s_root_bh->b_data,sb)->disk_altered);
 		affs_fix_checksum(sb->s_blocksize,sb->u.affs_sb.s_root_bh->b_data,5);
-		mark_buffer_dirty(sb->u.affs_sb.s_root_bh,1);
+		mark_buffer_dirty(sb->u.affs_sb.s_root_bh);
 	}
 
 	if (sb->u.affs_sb.s_prefix)
@@ -88,7 +88,7 @@ affs_write_super(struct super_block *sb)
 		secs_to_datestamp(CURRENT_TIME,
 				  &ROOT_END_S(sb->u.affs_sb.s_root_bh->b_data,sb)->disk_altered);
 		affs_fix_checksum(sb->s_blocksize,sb->u.affs_sb.s_root_bh->b_data,5);
-		mark_buffer_dirty(sb->u.affs_sb.s_root_bh,1);
+		mark_buffer_dirty(sb->u.affs_sb.s_root_bh);
 		sb->s_dirt = !clean;	/* redo until bitmap synced */
 	} else
 		sb->s_dirt = 0;
@@ -491,7 +491,7 @@ got_root:
 					chksum = cpu_to_be32(0x7FFFFFFF >> (31 - key));
 					((u32 *)bb->b_data)[ptype] &= chksum;
 					affs_fix_checksum(s->s_blocksize,bb->b_data,0);
-					mark_buffer_dirty(bb,1);
+					mark_buffer_dirty(bb);
 					bmalt = 1;
 				}
 				ptype = (size + 31) & ~0x1F;
@@ -553,7 +553,7 @@ nobitmap:
 			secs_to_datestamp(CURRENT_TIME,&ROOT_END(
 				s->u.affs_sb.s_root_bh->b_data,root_inode)->disk_altered);
 			affs_fix_checksum(s->s_blocksize,s->u.affs_sb.s_root_bh->b_data,5);
-			mark_buffer_dirty(s->u.affs_sb.s_root_bh,1);
+			mark_buffer_dirty(s->u.affs_sb.s_root_bh);
 		}
 		affs_make_zones(s);
 	}