Separated locks for cifs and server operations

Change-Id: I15d7cd825f9fdf66366db47b0cf7649ba270e27d
Merge "Separated locks for cifs and server operations"