From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 27 Jul 2011 20:21:40 +0000 (-0700)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target... 
X-Git-Tag: upstream/snapshot3+hdmi~9445
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=91d41fdf31f74e6e2e5f3cb018eca4200e36e202;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'for-next' of git://git./linux/kernel/git/nab/target-pending

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
  kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
  iscsi-target: Add iSCSI fabric support for target v4.1
  iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
  iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
  iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi
---

91d41fdf31f74e6e2e5f3cb018eca4200e36e202
diff --cc drivers/scsi/bnx2i/bnx2i_iscsi.c
index 5c55a75,97ff47c..cffd4d7
--- a/drivers/scsi/bnx2i/bnx2i_iscsi.c
+++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c
@@@ -1213,10 -1212,9 +1213,10 @@@ static int bnx2i_task_xmit(struct iscsi
  	struct bnx2i_conn *bnx2i_conn = conn->dd_data;
  	struct scsi_cmnd *sc = task->sc;
  	struct bnx2i_cmd *cmd = task->dd_data;
- 	struct iscsi_cmd *hdr = (struct iscsi_cmd *) task->hdr;
+ 	struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)task->hdr;
  
 -	if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes)
 +	if (atomic_read(&bnx2i_conn->ep->num_active_cmds) + 1  >
 +	    hba->max_sqes)
  		return -ENOMEM;
  
  	/*