Re: TS-857 and finer grained locking

[taorui]

Thanks John and AMC, especially for AMC, he contribute a lot to solve
this problem. Thanks again.