summaryrefslogtreecommitdiffstats
path: root/fs/affs/amigaffs.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-10-05 01:18:40 +0000
commit012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch)
tree87efc733f9b164e8c85c0336f92c8fb7eff6d183 /fs/affs/amigaffs.c
parent625a1589d3d6464b5d90b8a0918789e3afffd220 (diff)
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.
Diffstat (limited to 'fs/affs/amigaffs.c')
-rw-r--r--fs/affs/amigaffs.c8
1 files changed, 4 insertions, 4 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. */