summaryrefslogtreecommitdiff
path: root/fs/btrfs/root-tree.c
diff options
context:
space:
mode:
authorChris Mason <clm@fb.com>2015-10-22 04:21:40 +0300
committerChris Mason <clm@fb.com>2015-10-22 04:21:40 +0300
commita0d58e48db58801a0e764e9b9c87e1782d390fcb (patch)
treef413f86da859552a29df58f40d450372977b5673 /fs/btrfs/root-tree.c
parent6db4a7335dd701a0e20275440ee057d3db2a7ae3 (diff)
parentddd664f4478a4aaf0ac67a4297e33f1992bc9be2 (diff)
downloadlinux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.xz
Merge branch 'cleanups/for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.4
Diffstat (limited to 'fs/btrfs/root-tree.c')
-rw-r--r--fs/btrfs/root-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index bc9dcc53f66d..7cf8509deda7 100644
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -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)