]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
target: Remove extra percpu_ref_init
authorAndy Grover <agrover@redhat.com>
Tue, 26 Nov 2013 19:49:24 +0000 (11:49 -0800)
committerNicholas Bellinger <nab@linux-iscsi.org>
Thu, 19 Dec 2013 22:49:54 +0000 (14:49 -0800)
lun->lun_ref is also initialized in core_tpg_post_addlun, so it doesn't
need to be done in core_tpg_setup_virtual_lun0.

(nab: Drop left-over percpu_ref_cancel_init in failure path)

Signed-off-by: Andy Grover <agrover@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
drivers/target/target_core_tpg.c

index f755712a9a0d22bfb7f0bfdf0db8b6f9f5186451..2a573de19a9fdceea07d233f15a699be6c10c770 100644 (file)
@@ -656,15 +656,9 @@ static int core_tpg_setup_virtual_lun0(struct se_portal_group *se_tpg)
        spin_lock_init(&lun->lun_sep_lock);
        init_completion(&lun->lun_ref_comp);
 
-       ret = percpu_ref_init(&lun->lun_ref, core_tpg_lun_ref_release);
-       if (ret < 0)
-               return ret;
-
        ret = core_tpg_post_addlun(se_tpg, lun, lun_access, dev);
-       if (ret < 0) {
-               percpu_ref_cancel_init(&lun->lun_ref);
+       if (ret < 0)
                return ret;
-       }
 
        return 0;
 }