linux-toradex.git/drivers/scsi/libfc, branch imx-android-r12

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2011-01-13T18:05:56+00:00

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.

Merge branch 'master' into for-next

2010-12-22T17:57:02+00:00

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

[SCSI] libfc: fix statistics for FCP input/output megabytes

2010-12-21T18:24:34+00:00

The statistics for InputMegabytes and OutputMegabytes are
misnamed.  They're accumulating bytes, not megabytes.

The statistic returned via /sys must be in megabytes, however,
which is what the HBA-API wants.  The FCP code needs to accumulate
it in bytes and then divide by 1,000,000 (not 2^20) before it
presented via sysfs.

This affects fcoe.ko only, not fnic.  The fnic driver
correctly by accumulating bytes and then converts to megabytes.

I checked that libhbalinux is using the /sys file directly without
conversion.

BTW, qla2xxx does divide by 2^20, which I'm not fixing here.

Signed-off-by: Joe Eykholt 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: fix fc_tm_done not freeing the allocated fsp pkt

2010-12-21T18:24:27+00:00

Frame should be freed in fc_tm_done, this is an updated patch on the one
initially submitted by Hillf Danton.

Signed-off-by: Hillf Danton 
Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: the timeout for the REC itself is 2 * R_A_TOV_els

2010-12-21T18:24:27+00:00

The timeout for the exchange carrying REC itself is 2 * R_A_TOV_els.

Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: fix exchange being deleted when the abort itself is timed out

2010-12-21T18:24:26+00:00

Should not continue when the abort itself is being timeout since in that case
the exchange will be deleted and relesased. We still want to call the
associated response handler to let the layer, e.g., fcp, know the exchange
itself is being timed out.

Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: do not fc_io_compl on fsp w/o any scsi_cmnd associated

2010-12-21T18:24:25+00:00

Do not call fc_io_compl() on fsp w/o any scsi_cmnd, e.g., lun reset is built
inside fc_fcp, not from a scsi command from queuecommnd from scsi-ml, so in
in case target is buggy that is invalid flags in the FCP_RSP, as we have seen
in some SAN Blaze target where all bits in flags are 0, we do not want to call
io_compl on this fsp.

[ Comment block added by Robert Love ]

Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: add print of exchange id for debugging fc_fcp

2010-12-21T18:24:25+00:00

This is very helpful to match up the corresponding exchange to the actual I/O
described by the fsp, particularly when you do a side-by-side comparison of
the syslog with your trace.

Signed-off-by: Yi Zou 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: fix memory leakage in remote port

2010-12-21T18:24:24+00:00

There seems rdata should get put before return.

Signed-off-by: Hillf Danton 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley

[SCSI] libfc: fix memory leakage in local port

2010-12-21T18:24:23+00:00

There seems info should get freed when error encountered.

Signed-off-by: Hillf Danton 
Signed-off-by: Robert Love 
Signed-off-by: James Bottomley