From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Aug 2018 18:48:42 +0000 (-0700)
Subject: Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax
X-Git-Tag: microblaze-v5.0-rc1~475
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=aba16dc5cf9318b4e0fe92f8261779cd9f1d2d77

Merge branch 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax

Pull IDA updates from Matthew Wilcox:
 "A better IDA API:

      id = ida_alloc(ida, GFP_xxx);
      ida_free(ida, id);

  rather than the cumbersome ida_simple_get(), ida_simple_remove().

  The new IDA API is similar to ida_simple_get() but better named.  The
  internal restructuring of the IDA code removes the bitmap
  preallocation nonsense.

  I hope the net -200 lines of code is convincing"

* 'ida-4.19' of git://git.infradead.org/users/willy/linux-dax: (29 commits)
  ida: Change ida_get_new_above to return the id
  ida: Remove old API
  test_ida: check_ida_destroy and check_ida_alloc
  test_ida: Convert check_ida_conv to new API
  test_ida: Move ida_check_max
  test_ida: Move ida_check_leaf
  idr-test: Convert ida_check_nomem to new API
  ida: Start new test_ida module
  target/iscsi: Allocate session IDs from an IDA
  iscsi target: fix session creation failure handling
  drm/vmwgfx: Convert to new IDA API
  dmaengine: Convert to new IDA API
  ppc: Convert vas ID allocation to new IDA API
  media: Convert entity ID allocation to new IDA API
  ppc: Convert mmu context allocation to new IDA API
  Convert net_namespace to new IDA API
  cb710: Convert to new IDA API
  rsxx: Convert to new IDA API
  osd: Convert to new IDA API
  sd: Convert to new IDA API
  ...
---

aba16dc5cf9318b4e0fe92f8261779cd9f1d2d77
diff --cc drivers/target/iscsi/iscsi_target_login.c
index 923b1a9fc3dc,b75a8b283581..9e74f8bc2963
--- a/drivers/target/iscsi/iscsi_target_login.c
+++ b/drivers/target/iscsi/iscsi_target_login.c
@@@ -365,11 -358,10 +358,10 @@@ static int iscsi_login_zero_tsih_s1
  				ISCSI_LOGIN_STATUS_NO_RESOURCES);
  		pr_err("Unable to allocate memory for"
  				" struct iscsi_sess_ops.\n");
- 		kfree(sess);
- 		return -ENOMEM;
+ 		goto free_id;
  	}
  
 -	sess->se_sess = transport_init_session(TARGET_PROT_NORMAL);
 +	sess->se_sess = transport_alloc_session(TARGET_PROT_NORMAL);
  	if (IS_ERR(sess->se_sess)) {
  		iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
  				ISCSI_LOGIN_STATUS_NO_RESOURCES);
diff --cc lib/Kconfig.debug
index 3589765141a8,2fff661d9070..613316724c6a
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@@ -1833,8 -1827,12 +1833,11 @@@ config TEST_HAS
  	  This is intended to help people writing architecture-specific
  	  optimized versions.  If unsure, say N.
  
+ config TEST_IDA
+ 	tristate "Perform selftest on IDA functions"
+ 
  config TEST_PARMAN
  	tristate "Perform selftest on priority array manager"
 -	default n
  	depends on PARMAN
  	help
  	  Enable this option to test priority array manager on boot