diff --git a/[refs] b/[refs] index ef79ca2886a6..5a523ad89d72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49cf6f4529b7945ef51b8e39f0bac630726f8c96 +refs/heads/master: fd2696f399e45347c07f1f7f340e8515cace5657 diff --git a/trunk/fs/btrfs/volumes.c b/trunk/fs/btrfs/volumes.c index be953afe804c..20cbd2eebd97 100644 --- a/trunk/fs/btrfs/volumes.c +++ b/trunk/fs/btrfs/volumes.c @@ -446,8 +446,10 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig) goto error; device->name = kstrdup(orig_dev->name, GFP_NOFS); - if (!device->name) + if (!device->name) { + kfree(device); goto error; + } device->devid = orig_dev->devid; device->work.func = pending_bios_fn;