diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
index e80df932b1e92..c8403278b389b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/ReplicaMap.java
@@ -103,10 +103,8 @@ ReplicaInfo get(String bpid, Block block) {
    */
   ReplicaInfo get(String bpid, long blockId) {
     checkBlockPool(bpid);
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
-      return m != null ? m.get(new Block(blockId)) : null;
-    }
+    LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
+    return m != null ? m.get(new Block(blockId)) : null;
   }
 
   /**
@@ -120,15 +118,13 @@ ReplicaInfo get(String bpid, long blockId) {
   ReplicaInfo add(String bpid, ReplicaInfo replicaInfo) {
     checkBlockPool(bpid);
     checkBlock(replicaInfo);
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
-      if (m == null) {
-        // Add an entry for block pool if it does not exist already
-        map.putIfAbsent(bpid, new LightWeightResizableGSet<Block, ReplicaInfo>());
-        m = map.get(bpid);
-      }
-      return  m.put(replicaInfo);
+    LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
+    if (m == null) {
+      // Add an entry for block pool if it does not exist already
+      map.putIfAbsent(bpid, new LightWeightResizableGSet<Block, ReplicaInfo>());
+      m = map.get(bpid);
     }
+    return m.put(replicaInfo);
   }
 
   /**
@@ -138,21 +134,19 @@ ReplicaInfo add(String bpid, ReplicaInfo replicaInfo) {
   ReplicaInfo addAndGet(String bpid, ReplicaInfo replicaInfo) {
     checkBlockPool(bpid);
     checkBlock(replicaInfo);
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
-      if (m == null) {
-        // Add an entry for block pool if it does not exist already
-        map.putIfAbsent(bpid, new LightWeightResizableGSet<Block, ReplicaInfo>());
-        m = map.get(bpid);
-      }
-      ReplicaInfo oldReplicaInfo = m.get(replicaInfo);
-      if (oldReplicaInfo != null) {
-        return oldReplicaInfo;
-      } else {
-        m.put(replicaInfo);
-      }
-      return replicaInfo;
+    LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
+    if (m == null) {
+      // Add an entry for block pool if it does not exist already
+      map.putIfAbsent(bpid, new LightWeightResizableGSet<Block, ReplicaInfo>());
+      m = map.get(bpid);
+    }
+    ReplicaInfo oldReplicaInfo = m.get(replicaInfo);
+    if (oldReplicaInfo != null) {
+      return oldReplicaInfo;
+    } else {
+      m.put(replicaInfo);
     }
+    return replicaInfo;
   }
 
   /**
@@ -202,17 +196,14 @@ void mergeAll(ReplicaMap other) {
   ReplicaInfo remove(String bpid, Block block) {
     checkBlockPool(bpid);
     checkBlock(block);
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
-      if (m != null) {
-        ReplicaInfo replicaInfo = m.get(block);
-        if (replicaInfo != null &&
-            block.getGenerationStamp() == replicaInfo.getGenerationStamp()) {
-          return m.remove(block);
-        }
+    LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
+    if (m != null) {
+      ReplicaInfo replicaInfo = m.get(block);
+      if (replicaInfo != null &&
+          block.getGenerationStamp() == replicaInfo.getGenerationStamp()) {
+        return m.remove(block);
       }
     }
-    
     return null;
   }
   
@@ -224,11 +215,9 @@ ReplicaInfo remove(String bpid, Block block) {
    */
   ReplicaInfo remove(String bpid, long blockId) {
     checkBlockPool(bpid);
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
-      if (m != null) {
-        return m.remove(new Block(blockId));
-      }
+    LightWeightResizableGSet<Block, ReplicaInfo> m = map.get(bpid);
+    if (m != null) {
+      return m.remove(new Block(blockId));
     }
     return null;
   }
@@ -267,11 +256,9 @@ Collection<ReplicaInfo> replicas(String bpid) {
    */
   void replicas(String bpid, Consumer<Iterator<ReplicaInfo>> consumer) {
     LightWeightResizableGSet<Block, ReplicaInfo> m = null;
-    try (AutoCloseDataSetLock l = lockManager.readLock(LockLevel.BLOCK_POOl, bpid)) {
-      m = map.get(bpid);
-      if (m !=null) {
-        m.getIterator(consumer);
-      }
+    m = map.get(bpid);
+    if (m !=null) {
+      m.getIterator(consumer);
     }
   }