Merge branch 'upstream' into merge

1 files changed, 11 insertions, 0 deletions

diff --git a/libglusterfs/src/syscall.c b/libglusterfs/src/syscall.c
index e8954cc23..d1b9ef84c 100644
--- a/libglusterfs/src/syscall.c
+++ b/libglusterfs/src/syscall.c
@@ -120,7 +120,18 @@ sys_rename (const char *oldpath, const char *newpath)
 int
 sys_link (const char *oldpath, const char *newpath)
 {
+#ifdef HAVE_LINKAT
+	/*
+	 * On most systems (Linux being the notable exception), link(2)
+	 * first resolves symlinks. If the target is a directory or
+	 * is nonexistent, it will fail. linkat(2) operates on the
+	 * symlink instead of its target when the AT_SYMLINK_FOLLOW
+	 * flag is not supplied.
+	 */
+        return linkat (AT_FDCWD, oldpath, AT_FDCWD, newpath, 0);
+#else
         return link (oldpath, newpath);
+#endif
 }