diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-01-18 20:15:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 20:15:05 +0100 |
| commit | 4092762aebfe55c1f8e31440b80a053c2dbe519b (patch) | |
| tree | 8fb9fd14131194174c12daf5d8195afd3b62bc3e /fs/ext2/dir.c | |
| parent | trace: set max latency variable to zero on default (diff) | |
| parent | Linux 2.6.29-rc2 (diff) | |
| download | linux-dev-4092762aebfe55c1f8e31440b80a053c2dbe519b.tar.xz linux-dev-4092762aebfe55c1f8e31440b80a053c2dbe519b.zip | |
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
Diffstat (limited to 'fs/ext2/dir.c')
| -rw-r--r-- | fs/ext2/dir.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext2/dir.c b/fs/ext2/dir.c index 9a0fc400f91c..2999d72153b7 100644 --- a/fs/ext2/dir.c +++ b/fs/ext2/dir.c @@ -95,10 +95,13 @@ static int ext2_commit_chunk(struct page *page, loff_t pos, unsigned len) mark_inode_dirty(dir); } - if (IS_DIRSYNC(dir)) + if (IS_DIRSYNC(dir)) { err = write_one_page(page, 1); - else + if (!err) + err = ext2_sync_inode(dir); + } else { unlock_page(page); + } return err; } |