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/msdos | |
| 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/msdos')
| -rw-r--r-- | fs/msdos/namei.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/msdos/namei.c b/fs/msdos/namei.c index 79f700650..d7e77a316 100644 --- a/fs/msdos/namei.c +++ b/fs/msdos/namei.c @@ -265,7 +265,7 @@ static int msdos_add_entry(struct inode *dir, const char *name, (*de)->starthi = 0; fat_date_unix2dos(dir->i_mtime,&(*de)->time,&(*de)->date); (*de)->size = 0; - fat_mark_buffer_dirty(sb, *bh, 1); + fat_mark_buffer_dirty(sb, *bh); return 0; } @@ -330,7 +330,7 @@ int msdos_rmdir(struct inode *dir, struct dentry *dentry) goto rmdir_done; de->name[0] = DELETED_FLAG; - fat_mark_buffer_dirty(sb, bh, 1); + fat_mark_buffer_dirty(sb, bh); fat_detach(inode); inode->i_nlink = 0; inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME; @@ -396,7 +396,7 @@ mkdir_error: mark_inode_dirty(inode); mark_inode_dirty(dir); de->name[0] = DELETED_FLAG; - fat_mark_buffer_dirty(sb, bh, 1); + fat_mark_buffer_dirty(sb, bh); fat_brelse(sb, bh); fat_detach(inode); iput(inode); @@ -424,7 +424,7 @@ int msdos_unlink( struct inode *dir, struct dentry *dentry) goto unlink_done; de->name[0] = DELETED_FLAG; - fat_mark_buffer_dirty(sb, bh, 1); + fat_mark_buffer_dirty(sb, bh); fat_detach(inode); fat_brelse(sb, bh); inode->i_nlink = 0; @@ -485,7 +485,7 @@ static int do_msdos_rename(struct inode *old_dir, char *old_name, if (new_inode) fat_detach(new_inode); old_de->name[0] = DELETED_FLAG; - fat_mark_buffer_dirty(sb, old_bh, 1); + fat_mark_buffer_dirty(sb, old_bh); fat_detach(old_inode); fat_attach(old_inode, new_ino); if (is_hid) @@ -504,7 +504,7 @@ static int do_msdos_rename(struct inode *old_dir, char *old_name, if (dotdot_bh) { dotdot_de->start = CT_LE_W(MSDOS_I(new_dir)->i_logstart); dotdot_de->starthi = CT_LE_W((MSDOS_I(new_dir)->i_logstart) >> 16); - fat_mark_buffer_dirty(sb, dotdot_bh, 1); + fat_mark_buffer_dirty(sb, dotdot_bh); old_dir->i_nlink--; mark_inode_dirty(old_dir); if (new_inode) { |