From 8c81ead32da87e75f1b97c8b26707e5376924e71 Mon Sep 17 00:00:00 2001
From: Yagiz Nizipli <yagiz@nizipli.com>
Date: Fri, 29 Sep 2023 13:13:11 -0400
Subject: [PATCH] fs: improve error performance of `lchownSync`

---
 lib/fs.js                       |  8 +++++---
 src/node_file.cc                | 12 +++++-------
 typings/internalBinding/fs.d.ts |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/fs.js b/lib/fs.js
index 5cbef2c15cb0f3..ab153574b62ca8 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -2020,9 +2020,11 @@ function lchownSync(path, uid, gid) {
   path = getValidatedPath(path);
   validateInteger(uid, 'uid', -1, kMaxUserId);
   validateInteger(gid, 'gid', -1, kMaxUserId);
-  const ctx = { path };
-  binding.lchown(pathModule.toNamespacedPath(path), uid, gid, undefined, ctx);
-  handleErrorFromBinding(ctx);
+  binding.lchown(
+    pathModule.toNamespacedPath(path),
+    uid,
+    gid,
+  );
 }
 
 /**
diff --git a/src/node_file.cc b/src/node_file.cc
index 09658f3de22ff6..fefe1c28b2795b 100644
--- a/src/node_file.cc
+++ b/src/node_file.cc
@@ -2621,7 +2621,7 @@ static void LChown(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
   const int argc = args.Length();
-  CHECK_GE(argc, 3);
+  CHECK_GE(argc, 2);
 
   BufferValue path(env->isolate(), args[0]);
   CHECK_NOT_NULL(*path);
@@ -2634,18 +2634,16 @@ static void LChown(const FunctionCallbackInfo<Value>& args) {
   CHECK(IsSafeJsInt(args[2]));
   const uv_gid_t gid = static_cast<uv_gid_t>(args[2].As<Integer>()->Value());
 
-  FSReqBase* req_wrap_async = GetReqWrap(args, 3);
-  if (req_wrap_async != nullptr) {  // lchown(path, uid, gid, req)
+  if (argc > 3) {  // lchown(path, uid, gid, req)
+    FSReqBase* req_wrap_async = GetReqWrap(args, 3);
     FS_ASYNC_TRACE_BEGIN1(
         UV_FS_LCHOWN, req_wrap_async, "path", TRACE_STR_COPY(*path))
     AsyncCall(env, req_wrap_async, args, "lchown", UTF8, AfterNoArgs,
               uv_fs_lchown, *path, uid, gid);
   } else {  // lchown(path, uid, gid, undefined, ctx)
-    CHECK_EQ(argc, 5);
-    FSReqWrapSync req_wrap_sync;
+    FSReqWrapSync req_wrap_sync("lchown", *path);
     FS_SYNC_TRACE_BEGIN(lchown);
-    SyncCall(env, args[4], &req_wrap_sync, "lchown",
-             uv_fs_lchown, *path, uid, gid);
+    SyncCallAndThrowOnError(env, &req_wrap_sync, uv_fs_lchown, *path, uid, gid);
     FS_SYNC_TRACE_END(lchown);
   }
 }
diff --git a/typings/internalBinding/fs.d.ts b/typings/internalBinding/fs.d.ts
index 0b850f65f93ec1..eb37ea8e03eab9 100644
--- a/typings/internalBinding/fs.d.ts
+++ b/typings/internalBinding/fs.d.ts
@@ -114,6 +114,7 @@ declare namespace InternalFSBinding {
   function lchown(path: string, uid: number, gid: number, req: FSReqCallback): void;
   function lchown(path: string, uid: number, gid: number, req: undefined, ctx: FSSyncContext): void;
   function lchown(path: string, uid: number, gid: number, usePromises: typeof kUsePromises): Promise<void>;
+  function lchown(path: string, uid: number, gid: number): void;
 
   function link(existingPath: string, newPath: string, req: FSReqCallback): void;
   function link(existingPath: string, newPath: string, req: undefined, ctx: FSSyncContext): void;