diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /fs/reiserfs/file.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'fs/reiserfs/file.c')
| -rw-r--r-- | fs/reiserfs/file.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index 752cea12e30f..f318b58510fd 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c | |||
| @@ -860,8 +860,12 @@ static int reiserfs_submit_file_region_for_write(struct reiserfs_transaction_han | |||
| 860 | // this sets the proper flags for O_SYNC to trigger a commit | 860 | // this sets the proper flags for O_SYNC to trigger a commit |
| 861 | mark_inode_dirty(inode); | 861 | mark_inode_dirty(inode); |
| 862 | reiserfs_write_unlock(inode->i_sb); | 862 | reiserfs_write_unlock(inode->i_sb); |
| 863 | } else | 863 | } else { |
| 864 | reiserfs_write_lock(inode->i_sb); | ||
| 865 | reiserfs_update_inode_transaction(inode); | ||
| 864 | mark_inode_dirty(inode); | 866 | mark_inode_dirty(inode); |
| 867 | reiserfs_write_unlock(inode->i_sb); | ||
| 868 | } | ||
| 865 | 869 | ||
| 866 | sd_update = 1; | 870 | sd_update = 1; |
| 867 | } | 871 | } |
