diff options
author | Chris Mason <chris.mason@oracle.com> | 2007-12-18 16:15:09 -0500 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:03:58 -0400 |
commit | 6da6abae027e2dbc59bca5f4168b0760f25068c7 (patch) | |
tree | a1e9c70c930e8b01baead984b706042067148788 /fs/btrfs/transaction.c | |
parent | c59f8951d48c5eb000926935f3ab063d8181d1ee (diff) |
Btrfs: Back port to 2.6.18-el kernels
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
-rw-r--r-- | fs/btrfs/transaction.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 0229e69bd2ff..1ad611b9f61b 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
@@ -614,12 +614,20 @@ int btrfs_clean_old_snapshots(struct btrfs_root *root) | |||
614 | } | 614 | } |
615 | return 0; | 615 | return 0; |
616 | } | 616 | } |
617 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) | ||
618 | void btrfs_transaction_cleaner(void *p) | ||
619 | #else | ||
617 | void btrfs_transaction_cleaner(struct work_struct *work) | 620 | void btrfs_transaction_cleaner(struct work_struct *work) |
621 | #endif | ||
618 | { | 622 | { |
623 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,18) | ||
624 | struct btrfs_fs_info *fs_info = p; | ||
625 | #else | ||
619 | struct btrfs_fs_info *fs_info = container_of(work, | 626 | struct btrfs_fs_info *fs_info = container_of(work, |
620 | struct btrfs_fs_info, | 627 | struct btrfs_fs_info, |
621 | trans_work.work); | 628 | trans_work.work); |
622 | 629 | ||
630 | #endif | ||
623 | struct btrfs_root *root = fs_info->tree_root; | 631 | struct btrfs_root *root = fs_info->tree_root; |
624 | struct btrfs_transaction *cur; | 632 | struct btrfs_transaction *cur; |
625 | struct btrfs_trans_handle *trans; | 633 | struct btrfs_trans_handle *trans; |