diff options
| author |  Chris Mason <clm@fb.com>
| 2015-10-21 18:21:40 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com>
| 2015-10-21 18:21:40 -0700 |
| commit | a0d58e48db58801a0e764e9b9c87e1782d390fcb (patch) | |
| tree | f413f86da859552a29df58f40d450372977b5673 /fs/btrfs/ctree.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.gz linux-a0d58e48db58801a0e764e9b9c87e1782d390fcb.tar.bz2 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/ctree.c')
| -rw-r--r-- | fs/btrfs/ctree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index 1063315fb387..5b8e235c4b6d 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -4940,8 +4940,8 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, { struct extent_buffer *leaf; struct btrfs_item *item; - int last_off; - int dsize = 0; + u32 last_off; + u32 dsize = 0; int ret = 0; int wret; int i; |