From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Sat, 15 Jan 2011 16:49:54 +0000 (-0500)
Subject: vol: use OS_UNLINK() instead of unlink()
X-Git-Tag: upstream/1.8.0_pre1^2~4282
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=038264b4d62803bd71ac0d7706b56b7f18f31dca;p=packages%2Fo%2Fopenafs.git

vol: use OS_UNLINK() instead of unlink()

OS_UNLINK provides the platform specific mechanism
for unlinking objects.

Change-Id: Id0a1f50e57fe3c21c46e137e86507bf28bafa046
Reviewed-on: http://gerrit.openafs.org/3670
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 897c5e72d..21bc8adfa 100644
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -1153,7 +1153,7 @@ namei_replace_file_by_hardlink(IHandle_t *hLink, IHandle_t *hTarget)
     namei_HandleToName(&nameLink, hLink);
     namei_HandleToName(&nameTarget, hTarget);
 
-    unlink(nameLink.n_path);
+    OS_UNLINK(nameLink.n_path);
     code = link(nameTarget.n_path, nameLink.n_path);
     return code;
 }
@@ -1188,7 +1188,7 @@ namei_copy_on_write(IHandle_t *h)
 	buf = malloc(8192);
 	if (!buf) {
 	    close(fd);
-	    unlink(path);
+	    OS_UNLINK(path);
 	    FDH_CLOSE(fdP);
 	    return ENOMEM;
 	}
@@ -1209,7 +1209,7 @@ namei_copy_on_write(IHandle_t *h)
 	if (size)
 	    code = EIO;
 	else {
-	    unlink(name.n_path);
+	    OS_UNLINK(name.n_path);
 	    code = rename(path, name.n_path);
 	}
     }
@@ -2954,7 +2954,7 @@ namei_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
     MoveFileEx(n.n_path, newpath, MOVEFILE_WRITE_THROUGH);
 #else
     link(newpath, n.n_path);
-    unlink(newpath);
+    OS_UNLINK(newpath);
 #endif
 
     t_ih.ih_ino = namei_MakeSpecIno(ih->ih_vid, VI_LARGEINDEX);
@@ -2973,7 +2973,7 @@ namei_ConvertROtoRWvolume(char *pname, afs_uint32 volumeId)
     MoveFileEx(n.n_path, newpath, MOVEFILE_WRITE_THROUGH);
 #else
     link(newpath, n.n_path);
-    unlink(newpath);
+    OS_UNLINK(newpath);
 #endif
 
     OS_UNLINK(oldpath);