diff --git a/[refs] b/[refs] index 5e1f32f50a55..d6ea2a7c7999 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2eb0a241f0e5c135d93243b0236cb1f14c305e0 +refs/heads/master: 006a58a25fe8aaa7559be80dcff94d98aee84309 diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index 6d8dd4438c76..b38187573108 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -547,7 +547,7 @@ int btrfs_add_device(struct btrfs_trans_handle *trans, struct extent_buffer *leaf; struct btrfs_key key; unsigned long ptr; - u64 free_devid; + u64 free_devid = 0; root = root->fs_info->chunk_root;