Fix for Linux-3.0
Merge branch 'master' into linux-3.0
A workaround for writing failure on 201K.