From 1fadcf2163b24b9d3182bde244cf8e1d4269bcd9 Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 8 Oct 2020 21:30:15 -0400
Subject: [PATCH] fs: simplify validateRmOptions() error handling

PR-URL: https://github.com/nodejs/node/pull/35567
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
---
 lib/internal/fs/utils.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/internal/fs/utils.js b/lib/internal/fs/utils.js
index 5d3cc7154392ce..5ff7a281651f7b 100644
--- a/lib/internal/fs/utils.js
+++ b/lib/internal/fs/utils.js
@@ -684,17 +684,13 @@ const validateRmOptions = hideStackFrames((path, options, callback) => {
     );
 
   lazyLoadFs().stat(path, (err, stats) => {
-    if (err && err.code === 'ENOENT') {
-      if (options.force) {
+    if (err) {
+      if (options.force && err.code === 'ENOENT') {
         return callback(null, options);
       }
       return callback(err, options);
     }
 
-    if (err) {
-      return callback(err);
-    }
-
     if (stats.isDirectory() && !options.recursive) {
       return callback(new ERR_FS_EISDIR({
         code: 'EISDIR',