aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2007-12-18 16:15:09 -0500
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:03:58 -0400
commit6da6abae027e2dbc59bca5f4168b0760f25068c7 (patch)
treea1e9c70c930e8b01baead984b706042067148788 /fs/btrfs/disk-io.c
parentc59f8951d48c5eb000926935f3ab063d8181d1ee (diff)
Btrfs: Back port to 2.6.18-el kernels
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 7213012c27d5..ebb2db624fdd 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -593,8 +593,11 @@ struct btrfs_root *open_ctree(struct super_block *sb)
593 fs_info->do_barriers = 1; 593 fs_info->do_barriers = 1;
594 fs_info->closing = 0; 594 fs_info->closing = 0;
595 fs_info->total_pinned = 0; 595 fs_info->total_pinned = 0;
596 596#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18)
597 INIT_WORK(&fs_info->trans_work, btrfs_transaction_cleaner, fs_info);
598#else
597 INIT_DELAYED_WORK(&fs_info->trans_work, btrfs_transaction_cleaner); 599 INIT_DELAYED_WORK(&fs_info->trans_work, btrfs_transaction_cleaner);
600#endif
598 BTRFS_I(fs_info->btree_inode)->root = tree_root; 601 BTRFS_I(fs_info->btree_inode)->root = tree_root;
599 memset(&BTRFS_I(fs_info->btree_inode)->location, 0, 602 memset(&BTRFS_I(fs_info->btree_inode)->location, 0,
600 sizeof(struct btrfs_key)); 603 sizeof(struct btrfs_key));