Merge branch 'cleanups/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4

This commit is contained in:
Chris Mason
2015-10-21 18:21:40 -07:00
16 changed files with 216 additions and 207 deletions

View File

@@ -142,7 +142,7 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root
int ret;
int slot;
unsigned long ptr;
int old_len;
u32 old_len;
path = btrfs_alloc_path();
if (!path)