HDFS-4984. Incorrect Quota counting in INodeFile. Contributed by Jing Zhao.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1503397 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4972. Permission check and operation are done in a separate lock for getBlockLocations(). Contributed by Kihwal Lee.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1503461 13f79535-47bb-0310-9956-ffa450edef68