add gocritic/ruleguard checks back again, cleanup code. (#13665)

- remove some duplicated code
- reported a bug, separately fixed in #13664
- using strings.ReplaceAll() when needed
- using filepath.ToSlash() use when needed
- remove all non-Go style comments from the codebase

Co-authored-by: Aditya Manthramurthy <donatello@users.noreply.github.com>

internal/dsync/drwmutex.go

@@ -199,9 +199,9 @@ func (dm *DRWMutex) lockBlocking(ctx context.Context, lockLossCallback func(), i
 
 				// If success, copy array to object
 				if isReadLock {
-					copy(dm.readLocks, locks[:])
+					copy(dm.readLocks, locks)
 				} else {
-					copy(dm.writeLocks, locks[:])
+					copy(dm.writeLocks, locks)
 				}
 
 				dm.m.Unlock()
@@ -579,7 +579,7 @@ func (dm *DRWMutex) Unlock() {
 		}
 
 		// Copy write locks to stack array
-		copy(locks, dm.writeLocks[:])
+		copy(locks, dm.writeLocks)
 	}
 
 	// Tolerance is not set, defaults to half of the locker clients.
@@ -620,7 +620,7 @@ func (dm *DRWMutex) RUnlock() {
 		}
 
 		// Copy write locks to stack array
-		copy(locks, dm.readLocks[:])
+		copy(locks, dm.readLocks)
 	}
 
 	// Tolerance is not set, defaults to half of the locker clients.

internal/dsync/dsync-server_test.go

@@ -94,10 +94,8 @@ func (l *lockServer) RLock(args *LockArgs, reply *bool) error {
 	if locksHeld, *reply = l.lockMap[args.Resources[0]]; !*reply {
 		l.lockMap[args.Resources[0]] = ReadLock // No locks held on the given name, so claim (first) read lock
 		*reply = true
-	} else {
-		if *reply = locksHeld != WriteLock; *reply { // Unless there is a write lock
-			l.lockMap[args.Resources[0]] = locksHeld + ReadLock // Grant another read lock
-		}
+	} else if *reply = locksHeld != WriteLock; *reply { // Unless there is a write lock
+		l.lockMap[args.Resources[0]] = locksHeld + ReadLock // Grant another read lock
 	}
 	return nil
 }