diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:34:09 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-07-01 12:34:24 +0400 |
commit | 36b2e922b5acd291051fab25bc7535274ce49532 (patch) | |
tree | ef4cdd6894075bb419cc31625b037f2b9212962f /fs/ext3/inode.c | |
parent | e197f094b7da7d94812492cfcd706d143f1020e5 (diff) | |
parent | b0af8dfdd67699e25083478c63eedef2e72ebd85 (diff) | |
download | linux-36b2e922b5acd291051fab25bc7535274ce49532.tar.xz |
Merge commit 'v3.0-rc5' into sched/core
Merge reason: Move to a (much) newer base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ext3/inode.c')
-rw-r--r-- | fs/ext3/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c index 68b2e43d7c35..3451d23c3bae 100644 --- a/fs/ext3/inode.c +++ b/fs/ext3/inode.c @@ -3392,7 +3392,7 @@ int ext3_mark_inode_dirty(handle_t *handle, struct inode *inode) * so would cause a commit on atime updates, which we don't bother doing. * We handle synchronous inodes at the highest possible level. */ -void ext3_dirty_inode(struct inode *inode) +void ext3_dirty_inode(struct inode *inode, int flags) { handle_t *current_handle = ext3_journal_current_handle(); handle_t *handle; |