diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-11 19:07:25 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-11 19:07:25 -0400 |
| commit | 83ebade34bc1a90d0c3f77b87b940f336d075fda (patch) | |
| tree | 99b6366c52e6bec88119ae995399c985fc61e900 /fs/btrfs/ctree.h | |
| parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) | |
| parent | 93c82d575055f1bd0277acae6f966bebafd80dd5 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 837435ce84ca..732d5b884aa7 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
| @@ -2290,7 +2290,7 @@ extern struct file_operations btrfs_file_operations; | |||
| 2290 | int btrfs_drop_extents(struct btrfs_trans_handle *trans, | 2290 | int btrfs_drop_extents(struct btrfs_trans_handle *trans, |
| 2291 | struct btrfs_root *root, struct inode *inode, | 2291 | struct btrfs_root *root, struct inode *inode, |
| 2292 | u64 start, u64 end, u64 locked_end, | 2292 | u64 start, u64 end, u64 locked_end, |
| 2293 | u64 inline_limit, u64 *hint_block); | 2293 | u64 inline_limit, u64 *hint_block, int drop_cache); |
| 2294 | int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, | 2294 | int btrfs_mark_extent_written(struct btrfs_trans_handle *trans, |
| 2295 | struct btrfs_root *root, | 2295 | struct btrfs_root *root, |
| 2296 | struct inode *inode, u64 start, u64 end); | 2296 | struct inode *inode, u64 start, u64 end); |