d22a6a8b82
(cherry picked from commit bc4a32aea50e86819730312e89315c0244ce64bf) Conflicts: hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetUtil.java (cherry picked from commit ad7d3c4db8bfab007cc2ec1bad3c388fd7144369)