diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 17:38:28 +0300 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 17:38:28 +0300 |
| commit | 5f1b5664d97842bc5dba40c2053bf95270b6ff7a (patch) | |
| tree | 28d6a3aaf9c095ab2703634693615559329ee3b2 /fs/btrfs/ctree.h | |
| parent | 388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95 (diff) | |
| parent | 65bfa6580791f8c01fbc9cd8bd73d92aea53723f (diff) | |
| download | linux-5f1b5664d97842bc5dba40c2053bf95270b6ff7a.tar.xz | |
Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6
# Conflicts:
# fs/btrfs/file.c
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index bfe4a337fb4d..5f5c4fbd7a3c 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2353,6 +2353,9 @@ struct btrfs_map_token { unsigned long offset; }; +#define BTRFS_BYTES_TO_BLKS(fs_info, bytes) \ + ((bytes) >> (fs_info)->sb->s_blocksize_bits) + static inline void btrfs_init_map_token (struct btrfs_map_token *token) { token->kaddr = NULL; @@ -4027,7 +4030,7 @@ int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct inode *dir, u64 objectid, const char *name, int name_len); -int btrfs_truncate_page(struct inode *inode, loff_t from, loff_t len, +int btrfs_truncate_block(struct inode *inode, loff_t from, loff_t len, int front); int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, |