diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-05 19:41:22 -0400 |
| commit | 9efe21cb82b5dbe3b0b2ae4de4eccc64ecb94e95 (patch) | |
| tree | 7ff8833745d2f268f897f6fa4a27263b4a572245 /fs/btrfs/tree-log.h | |
| parent | de18836e447c2dc30120c0919b8db8ddc0401cc4 (diff) | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
Merge branch 'linus' into irq/threaded
Conflicts:
include/linux/irq.h
kernel/irq/handle.c
Diffstat (limited to 'fs/btrfs/tree-log.h')
| -rw-r--r-- | fs/btrfs/tree-log.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h index b9409b32ed02..d09c7609e16b 100644 --- a/fs/btrfs/tree-log.h +++ b/fs/btrfs/tree-log.h | |||
| @@ -22,14 +22,9 @@ | |||
| 22 | int btrfs_sync_log(struct btrfs_trans_handle *trans, | 22 | int btrfs_sync_log(struct btrfs_trans_handle *trans, |
| 23 | struct btrfs_root *root); | 23 | struct btrfs_root *root); |
| 24 | int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root); | 24 | int btrfs_free_log(struct btrfs_trans_handle *trans, struct btrfs_root *root); |
| 25 | int btrfs_log_dentry(struct btrfs_trans_handle *trans, | ||
| 26 | struct btrfs_root *root, struct dentry *dentry); | ||
| 27 | int btrfs_recover_log_trees(struct btrfs_root *tree_root); | 25 | int btrfs_recover_log_trees(struct btrfs_root *tree_root); |
| 28 | int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans, | 26 | int btrfs_log_dentry_safe(struct btrfs_trans_handle *trans, |
| 29 | struct btrfs_root *root, struct dentry *dentry); | 27 | struct btrfs_root *root, struct dentry *dentry); |
| 30 | int btrfs_log_inode(struct btrfs_trans_handle *trans, | ||
| 31 | struct btrfs_root *root, struct inode *inode, | ||
| 32 | int inode_only); | ||
| 33 | int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, | 28 | int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, |
| 34 | struct btrfs_root *root, | 29 | struct btrfs_root *root, |
| 35 | const char *name, int name_len, | 30 | const char *name, int name_len, |
| @@ -38,4 +33,16 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans, | |||
| 38 | struct btrfs_root *root, | 33 | struct btrfs_root *root, |
| 39 | const char *name, int name_len, | 34 | const char *name, int name_len, |
| 40 | struct inode *inode, u64 dirid); | 35 | struct inode *inode, u64 dirid); |
| 36 | int btrfs_join_running_log_trans(struct btrfs_root *root); | ||
| 37 | int btrfs_end_log_trans(struct btrfs_root *root); | ||
| 38 | int btrfs_pin_log_trans(struct btrfs_root *root); | ||
| 39 | int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, | ||
| 40 | struct btrfs_root *root, struct inode *inode, | ||
| 41 | struct dentry *parent, int exists_only); | ||
| 42 | void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans, | ||
| 43 | struct inode *dir, struct inode *inode, | ||
| 44 | int for_rename); | ||
| 45 | int btrfs_log_new_name(struct btrfs_trans_handle *trans, | ||
| 46 | struct inode *inode, struct inode *old_dir, | ||
| 47 | struct dentry *parent); | ||
| 41 | #endif | 48 | #endif |