xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6

Browse Source 
# Conflicts:
#	fs/btrfs/file.c
This commit is contained in:
David Sterba
2016-02-26 15:38:28 +01:00
parent 388f7b1d6e 65bfa65807
commit 5f1b5664d9
7 changed files with 321 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/ctree.h
View File

@@ -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,