diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /fs/reiserfs/dir.c | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'fs/reiserfs/dir.c')
| -rw-r--r-- | fs/reiserfs/dir.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c index 48ca45c0c..ad184a145 100644 --- a/fs/reiserfs/dir.c +++ b/fs/reiserfs/dir.c @@ -51,6 +51,8 @@ int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) { int windex ; struct reiserfs_transaction_handle th ; + lock_kernel(); + journal_begin(&th, dentry->d_inode->i_sb, 1) ; windex = push_journal_writer("dir_fsync") ; reiserfs_prepare_for_journal(th.t_super, SB_BUFFER_WITH_SB(th.t_super), 1) ; @@ -58,6 +60,8 @@ int reiserfs_dir_fsync(struct file *filp, struct dentry *dentry, int datasync) { pop_journal_writer(windex) ; journal_end_sync(&th, dentry->d_inode->i_sb, 1) ; + unlock_kernel(); + return ret ; } |