Branch HEAD

b=14138
r=adilger, nikita

resolve deadlock on i_size_read() introduced by race condition of i_size_write();
Use old size assignment to avoid deadlock (bz14326).