From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 21 Dec 2016 18:16:05 +0000 (-0800)
Subject: Merge branch 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.10-rc1~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d5db84a871f815968e4d2933b9dd6f8ab83f80d1;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'scsi-target-for-v4.10' of git://git./linux/kernel/git/bvanassche/linux

Pull scsi target cleanups from Bart Van Assche:
 "The changes here are:

   - a few small bug fixes for the iSCSI and user space target drivers.

   - minimize the target build time by about 30% by rearranging #include
     directives

   - fix the second argument passed to percpu_ida_alloc()

   - reduce the number of false positive warnings reported by sparse

  These patches pass Wu Fengguang's build bot tests and also the
  linux-next tests"

* 'scsi-target-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux:
  iscsi-target: Return error if unable to add network portal
  target: Fix spelling mistake and unwrap multi-line text
  target/iscsi: Fix double free in lio_target_tiqn_addtpg()
  target/user: Fix use-after-free of tcmu_cmds if they are expired
  target: Minimize #include directives
  target/user: Add an #include directive
  cxgbit: Add an #include directive
  ibmvscsi_tgt: Add two #include directives
  sbp-target: Add an #include directive
  qla2xxx: Add an #include directive
  configfs: Minimize #include directives
  usb: gadget: Fix second argument of percpu_ida_alloc()
  sbp-target: Fix second argument of percpu_ida_alloc()
  target/user: Fix a data type in tcmu_queue_cmd()
  target: Use NULL instead of 0 to represent a pointer
---

d5db84a871f815968e4d2933b9dd6f8ab83f80d1
diff --cc drivers/target/target_core_configfs.c
index a35a347,3bf6384..54b36c9
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@@ -143,8 -143,8 +143,8 @@@ static ssize_t target_core_item_dbroot_
  		pr_err("db_root: cannot open: %s\n", db_root_stage);
  		return -EINVAL;
  	}
 -	if (!S_ISDIR(fp->f_inode->i_mode)) {
 +	if (!S_ISDIR(file_inode(fp)->i_mode)) {
- 		filp_close(fp, 0);
+ 		filp_close(fp, NULL);
  		mutex_unlock(&g_tf_lock);
  		pr_err("db_root: not a directory: %s\n", db_root_stage);
  		return -EINVAL;