Branch b1_6

b=14326
r=johann,bwzhou

Use old size assignment to avoid deadlock caused by ll_inode_size_lock calls down semaphore under spinlock held.