Branch b_release_1_6_7
b=18224
i=johhan
i=green
i=adilger
i=wangdi

Branch b_release_1_6_7
b=18238
i=green
i=umka

Branch b_release_1_6_7
b=17972
i=shadow
i=johann

1, print the actual time to wait for
   lock cancellation in "waiting_locks_callback"

2, compare resource in "ost_rw_hpreq_lock_match"

3, replace "LDLM_ERROR" with "LDLM_WARN" if a lock
   is completed after waiting more than obd_timeout

i=vitaly.fertman
i=johann

Branch b_release_1_6_7
b=18150
i=grev

b=16839
i=adilger
i=tappro
i=green

Patch from shadow.
send ACTIVATE event only if connect finished and import have state FULL.

- synchronize test with HEAD version and rename it to test_35 (just like in HEAD);

- OBD_RACE in all execution branches in ldlm_lock_decref_internal() to balance OBD_RACE in bl_ast
and prevent hanging.

b=17379
i=johann, bobijam

Fixed incorrect vaule of symlink depth number.

- reformat after test 46a

i=H.Huang
test_57b remote mds fix

i=Brian
remote rundbench run fix

checking maximal acl size before set.

Branch b_release_1_6_7
b=17636
i=johann
i=deen

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

b=18083
i=Yong Fan
i=Andrew Perepechko

Enforce op. quota file format for MDS too

  - check for OBD_FAIL_OBD_LLOG_SETUP fail_loc regardless ->lop_setup definition. This is required because
  after changes in mds_ost llog setup, which is now done on behalf of separate thread, we need to make
  llog_setup() fail in context of mds start thread to make the test actualy work. And those llogs which
  get initialized in mds start thread do not have ->lop_setup defined.

remove redundant code in previous patch

i=tappro

i=Nathan.Rutman
i=Robert.Read
zconf_umount_client{s} fix: kill ps-s before force umount

b=16117
add test scripts for b16117.
i=adilger, johann

  r=shadow

  - handle possible hangup while waiting for dd processes;
  - write concurrently in smaller steps so probablity of bl_ast is higher.

b=18049
o=johann
i=adilger
i=zhenyu.xu (bobijam)

Descriptoin: aborting recovery hang on MDS
Details    : don't throttle destroy RPCs for the MDT.

Minor ChangeLog reformatting.

b=16117
fix complie warning, found by shadow
i=shadow

b=16972
o=Brian Behlendorf (behlendorf1@llnl.gov)
i=robert.read (rread)
i=adilger

Fix request leaks.

b=16117
The patch from Andreas to handle the corrupt debug log nicely for lctl df.
i=adilger,wangdi

b=18078
i=liang

Land lnet b1_x (the lnet gate branch has already been merged to b1_x) to
b_release_1_6_7 since many lnet fixes which were intended to be in 1.6.7
have only been landed to the lnet gate branch, but not on the lnet b1_x
& b_release_1_6_7 branches. Liang checked the diff and confirmed that
there is nothing that should not go to 1.6.7 here.

r=shadow,tappro

- remove wrong assert.

b=17993
i=sheng.yang, johann

Author: Jim Garlick(LLNL)
Clear rq_rep_swab_mask before DEBUG_REQ;

b=18018
i=johann
i=girish

i=sheng.yang
i=brian

use real vanilla kernel config/series.

restore "open lock" in reconstruct_open
in case MDS_OPEN_LOCK is set

i=Green
i=Johann

use "fed->fed_lr_off" instead of "off" before
"off" is set

i=johann
i=zhenyu.xu

r=shadow,johann

- do not reset lru_resize ns-connect flags in recconect if server was not upgraded

- fixes build issues

fix a build error caused by the patch of 16542
b=18027
i=tianzy
i=girish.shilamkar

meta blocks ignored can lead to occasional -EDQUOT occasionally
b=16542
i=johann
i=alex.zhuravlev

b=17898
i=adilger
i=grev

reset IFS to original value in test_130