diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:54:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-04 11:59:45 +0100 |
| commit | a2e71271535fde493c32803b1f34789f97efcb5e (patch) | |
| tree | 90d7139bea2f49e947f27af92614fa6eca50b64d /fs/btrfs/disk-io.c | |
| parent | 6d7aa9d721c8c640066142fd9534afcdf68d7f9d (diff) | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| download | op-kernel-dev-a2e71271535fde493c32803b1f34789f97efcb5e.zip op-kernel-dev-a2e71271535fde493c32803b1f34789f97efcb5e.tar.gz | |
Merge commit 'v2.6.32-rc6' into perf/core
Conflicts:
tools/perf/Makefile
Merge reason: Resolve the conflict, merge to upstream and merge in
perf fixes so we can add a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 100551a..02b6afb 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -917,6 +917,7 @@ static int __setup_root(u32 nodesize, u32 leafsize, u32 sectorsize, atomic_set(&root->log_writers, 0); root->log_batch = 0; root->log_transid = 0; + root->last_log_commit = 0; extent_io_tree_init(&root->dirty_log_pages, fs_info->btree_inode->i_mapping, GFP_NOFS); @@ -1087,6 +1088,7 @@ int btrfs_add_log_tree(struct btrfs_trans_handle *trans, WARN_ON(root->log_root); root->log_root = log_root; root->log_transid = 0; + root->last_log_commit = 0; return 0; } |
