diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /fs/sysv/inode.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (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/sysv/inode.c')
| -rw-r--r-- | fs/sysv/inode.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; } |