i=Adilger
conf-sanity test_32* fix

b=17371
i=Andreas Dilger

move the cleanup/setup test to the end of the series

fix mgs_setparam, which will return -EINVAL when param
related to llite(PARAM_LLITE) is set by MDT or OST

i=johann
i=nathan.rutman

i=Scjody
test_99a fix: use $TMP as working dir

b=17461
i=adilger
i=alex.zhuravlev

Ptlrpc optimizations to minimize COS overhead:
. reply state object use own locking instead of ptlrpc service one
. per-cpu dedicated threads for reply handling
. resource hash table size increase

fix resend requests for ldlm imports.

Branch HEAD
b=17695
i=umka
i=tappro

b=17589
i=yong.fan
i=yury.umanets

wait a bit while umount client if there is still ref count on mnt.

b=17867
i=yury.umanets

Compile fix: move the fld_cache_entry_delete function body
above all the references to it.

b=17742
i=h.huang
i=alexey.lyashkov

Add necessary spin-lock protection to dump_exports().

i=Adilger
fsx fix: limit bound file size by 1/2 RAM

r=shadow
- take into account the limit on the host because the higher limit the longer it takes to kill some locks.

i=Nikita
i=Rahul

	fix for lockdep warning. adds separate lockdep subclass for mdd_orphan
dir locking.

during refreshing locks waiting its I/O to complete,
take current service time into account, not only using
the timeout gotten by ldlm_get_enqueue_timeout

i=Andreas
i=Nathan.Rutman

b=16074
r=oleg,jay

small fixes for liblustre.

b=17844
i=rahul.deshmukh
i=pravin.shelar
This warning message does not need to be printed on the console during each startup

i=Adilger
i=Tappro
test_7-b fix: use do_nodes instead of loop to run rundbench

Fix double comment termination.
i=deen

i=Adilger
skip liblustre for different client/mds versions

fix an error in the test_18b of sanity-quota.sh
b=17832
i=tianzy

i=rread
i=isaac
Landing the patch making ksocklnd more os-neutral (normalizing names of
lock primitives, moving linux-spcific code to socklnd_lib-linux.c)

This is marked as 1.4.0 compat, see if it can be removed.

Fix up comments on patch, add description.

i=Adilger
i=Johann
test_6 fix

b=17752
i=yury.umanets
i=tianzy

Disable quota support for CMD case temporary.

i=Johann Lombardi
i=ZhiYong Tian

quota_check shall return an error when a target goes offline

i=Nikita
i=umka

	compact FLD feature.

let dqacq_in_flight() hold lock for qunit
b=16890
i=johann
i=panda

i=cliffw
i=wangyb

lbuild should not ignore the --with-linux option (and instead look for a
kernel-source RPM) specified for patchless builds

Remove extra whitespace at end of lines.

b=12596
i=grev
i=adilger

check striping after setstripe in recovery-small test 18*.
move get_stripe_info() to t-f.

b=16164
i=adilger
i=bobijam

enable OBD_CONNECT_{CKSUM,BRW_SIZE} in mds_lov_connect()

b=16860
i=nathan
i=rread

With AT enabled, the recovery window can be excessively long (6000+
seconds). To address this problem, we no longer use
OBD_RECOVERY_FACTOR when extending the recovery window (the connect
timeout no longer depends on the service time, it is set to
INITIAL_CONNECT_TIMEOUT now) and clients report the old service
time via pb_service_time.

b=17818
i=fanyong
i=pravin

b=12749
i=nathan,deen

Third of three patches for the root squash feature

map root UID/GID to UID/GID set via configuration parameter root_squash
with the exception for NID range set via configuration parameter nosquash_nids

b=12749
i=nathan,deen

Second of three patches for the root squash feature

This patch is to allow configuration parameters to contain spaces
It is accopmpished with
1. in mgs_write_log_params (renamed to mgs_write_log_param)
    assume the incoming string is a single parameter (the while loop is removed)
2. in mgs_write_log_target, call mgs_write_log_params for each parameter
a) new funcion class_get_next_param copies the entire next parameter into a temp buffer
   spaces are included if they are inside quotes (single or double)
   the first space outside of quotes is the terminator
   the quotes are stripped in the copy
   the copy is null-terminated
b) repeatedly call class_get_next_param and mgs_write_log_param in a loop from mgs_write_log_target

b=12749
i=maxim,isaac

First of three patches for the root squash feature

This adds three functions to manipulate with lists of NID ranges:
cfs_parse_nidlist - parses nid range list and
                    creates structure of lists of [lo,hi,stride,net]
                    which can be used to check matching a NID to set of NIDs
cfs_free_nidlist - frees structures allocated on nidlist parsing
cfs_match_nid - check whether a NID matches to set of NIDs
cfs_iswhite - auxiliary function to check if a character is a whitespace

These functions have prefixes cfs_ instead of libcfs_ because of bug #17167.

Example of NID range list: 10.2.0.[1-20/2]@tcp [0,2,6]@elan0 [1,2,4-100/4]@elan1
nidlist syntax:
  <nidlist>         :== <nidrange> [ ' ' <nidrange> ]
  <nidrange>        :== <addrrange> '@' <net>
  <addrrange>       :== '*' |
                        <ipaddr_range> |
                        <numaddr_range>
  <ipaddr_range>    :== <numaddr_range>.<numaddr_range>.<numaddr_range>.<numaddr_range>
  <numaddr_range>   :== <number> |
                        <expr_list>
  <expr_list>       :== '[' <range_expr> [ ',' <range_expr>] ']'
  <range_expr>      :== <number> |
                        <number> '-' <number> |
                        <number> '-' <number> '/' <number>
  <net>             :== <netname> | <netname><number>
  <netname>         :== "lo" | "tcp" | "o2ib" | "cib" | "openib" | "iib" |
                        "vib" | "ra" | "elan" | "gm" | "mx" | "ptl"
  <number>          :== <nonnegative decimal> | <hexadecimal>

Wireshark plugins for dissecting LNET/Lustre 1.6 packets.
(contributed by Stephane Thiell)

update b_som from the proper branch