diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-22 12:33:42 -0400 |
| commit | 945d8962ceee6bb273365d0bdf42f763225b290f (patch) | |
| tree | 43f5617022c7c947c3c63664e49eb9575ab82f2f /fs/btrfs/transaction.h | |
| parent | 0d0ca30f180906224be6279788f2b202cfd959d8 (diff) | |
| parent | 4ea028859bbdad34b84c9951fbb832ae10c6a96c (diff) | |
| download | linux-945d8962ceee6bb273365d0bdf42f763225b290f.tar.gz linux-945d8962ceee6bb273365d0bdf42f763225b290f.tar.bz2 linux-945d8962ceee6bb273365d0bdf42f763225b290f.zip | |
Merge branch 'cleanups' of git://repo.or.cz/linux-2.6/btrfs-unstable into inode_numbers
Conflicts:
fs/btrfs/extent-tree.c
fs/btrfs/free-space-cache.c
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.h')
| -rw-r--r-- | fs/btrfs/transaction.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index cb928c6c42e6..804c88639e5d 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h @@ -101,11 +101,8 @@ struct btrfs_trans_handle *btrfs_start_ioctl_transaction(struct btrfs_root *r, int btrfs_wait_for_commit(struct btrfs_root *root, u64 transid); int btrfs_write_and_wait_transaction(struct btrfs_trans_handle *trans, struct btrfs_root *root); -int btrfs_commit_tree_roots(struct btrfs_trans_handle *trans, - struct btrfs_root *root); int btrfs_add_dead_root(struct btrfs_root *root); -int btrfs_drop_dead_root(struct btrfs_root *root); int btrfs_defrag_root(struct btrfs_root *root, int cacheonly); int btrfs_clean_old_snapshots(struct btrfs_root *root); int btrfs_commit_transaction(struct btrfs_trans_handle *trans, |