diff options
| author | Chris Mason <clm@fb.com> | 2015-10-22 03:21:40 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-10-22 03:21:40 +0200 |
| commit | a0d58e48db58801a0e764e9b9c87e1782d390fcb (patch) | |
| tree | f413f86da859552a29df58f40d450372977b5673 /fs/btrfs/root-tree.c | |
| parent | Merge branch 'fix/waitqueue-barriers' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | btrfs: reada: Fix returned errno code (diff) | |
| download | linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.xz linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.zip | |
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.c | 2 |
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) |