From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Nov 2013 18:52:03 +0000 (-0800)
Subject: Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b0e3636f656c98bdeded5aaa78601e3256b18d6d;p=openwrt%2Fstaging%2Fblogic.git

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

Pull SCSI target updates from Nicholas Bellinger:
 "Things have been quiet this round with mostly bugfixes, percpu
  conversions, and other minor iscsi-target conformance testing changes.

  The highlights include:

   - Add demo_mode_discovery attribute for iscsi-target (Thomas)
   - Convert tcm_fc(FCoE) to use percpu-ida pre-allocation
   - Add send completion interrupt coalescing for ib_isert
   - Convert target-core to use percpu-refcounting for se_lun
   - Fix mutex_trylock usage bug in iscsit_increment_maxcmdsn
   - tcm_loop updates (Hannes)
   - target-core ALUA cleanups + prep for v3.14 SCSI Referrals support (Hannes)

  v3.14 is currently shaping to be a busy development cycle in target
  land, with initial support for T10 Referrals and T10 DIF currently on
  the roadmap"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (40 commits)
  iscsi-target: chap auth shouldn't match username with trailing garbage
  iscsi-target: fix extract_param to handle buffer length corner case
  iscsi-target: Expose default_erl as TPG attribute
  target_core_configfs: split up ALUA supported states
  target_core_alua: Make supported states configurable
  target_core_alua: Store supported ALUA states
  target_core_alua: Rename ALUA_ACCESS_STATE_OPTIMIZED
  target_core_alua: spellcheck
  target core: rename (ex,im)plict -> (ex,im)plicit
  percpu-refcount: Add percpu-refcount.o to obj-y
  iscsi-target: Do not reject non-immediate CmdSNs exceeding MaxCmdSN
  iscsi-target: Convert iscsi_session statistics to atomic_long_t
  target: Convert se_device statistics to atomic_long_t
  target: Fix delayed Task Aborted Status (TAS) handling bug
  iscsi-target: Reject unsupported multi PDU text command sequence
  ib_isert: Avoid duplicate iscsit_increment_maxcmdsn call
  iscsi-target: Fix mutex_trylock usage in iscsit_increment_maxcmdsn
  target: Core does not need blkdev.h
  target: Pass through I/O topology for block backstores
  iser-target: Avoid using FRMR for single dma entry requests
  ...
---

b0e3636f656c98bdeded5aaa78601e3256b18d6d
diff --cc lib/percpu_ida.c
index b0698ea972c6,e315903ec63a..9d054bf91d0f
--- a/lib/percpu_ida.c
+++ b/lib/percpu_ida.c
@@@ -114,11 -123,10 +114,10 @@@ static inline void alloc_global_tags(st
  {
  	move_tags(tags->freelist, &tags->nr_free,
  		  pool->freelist, &pool->nr_free,
 -		  min(pool->nr_free, IDA_PCPU_BATCH_MOVE));
 +		  min(pool->nr_free, pool->percpu_batch_size));
  }
  
- static inline unsigned alloc_local_tag(struct percpu_ida *pool,
- 				       struct percpu_ida_cpu *tags)
+ static inline unsigned alloc_local_tag(struct percpu_ida_cpu *tags)
  {
  	int tag = -ENOSPC;