From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 16 Jan 2014 05:17:11 +0000 (+1100)
Subject: Merge remote-tracking branch 'target-updates/for-next'
X-Git-Tag: next-20140116~12
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=04ea4f1cab516eeb094c646094c8b4640e01dcfc;p=karo-tx-linux.git

Merge remote-tracking branch 'target-updates/for-next'

Conflicts:
	drivers/target/target_core_tpg.c
---

04ea4f1cab516eeb094c646094c8b4640e01dcfc
diff --cc drivers/target/target_core_tpg.c
index 2a573de19a9f,d1df39a05d88..c036595b17cf
--- a/drivers/target/target_core_tpg.c
+++ b/drivers/target/target_core_tpg.c
@@@ -656,9 -658,15 +656,9 @@@ static int core_tpg_setup_virtual_lun0(
  	spin_lock_init(&lun->lun_sep_lock);
  	init_completion(&lun->lun_ref_comp);
  
- 	ret = core_tpg_post_addlun(se_tpg, lun, lun_access, dev);
 -	ret = percpu_ref_init(&lun->lun_ref, core_tpg_lun_ref_release);
 -	if (ret < 0)
 -		return ret;
 -
+ 	ret = core_tpg_add_lun(se_tpg, lun, lun_access, dev);
 -	if (ret < 0) {
 -		percpu_ref_cancel_init(&lun->lun_ref);
 +	if (ret < 0)
  		return ret;
 -	}
  
  	return 0;
  }