From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Mon, 28 Mar 2011 12:29:25 +0000 (-0400)
Subject: vol: remove flock emulation now provided by roken
X-Git-Tag: upstream/1.8.0_pre1^2~3960
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=3f3d0d999f1c6ab25271418c302a79e3e5661f10;p=packages%2Fo%2Fopenafs.git

vol: remove flock emulation now provided by roken

flock emulation is provided by rk_flock from roken.   No need
to provide a local emulation function in namei_ops.c.

This change removes a macro redefinition warning.

Change-Id: Id8b7cf030d8653ceb979db60c20ed28c03bd9737
Reviewed-on: http://gerrit.openafs.org/4365
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/vol/namei_ops.c b/src/vol/namei_ops.c
index 7cf30426c..98652a27e 100644
--- a/src/vol/namei_ops.c
+++ b/src/vol/namei_ops.c
@@ -74,31 +74,6 @@
 #include <vol/vol-salvage.h>
 #endif
 
-#if !defined(HAVE_FLOCK) && !defined(AFS_NT40_ENV)
-#include <fcntl.h>
-
-/*
- * This function emulates a subset of flock()
- */
-int
-emul_flock(int fd, int cmd)
-{    struct flock f;
-
-    memset(&f, 0, sizeof (f));
-
-    if (cmd & LOCK_UN)
-        f.l_type = F_UNLCK;
-    if (cmd & LOCK_SH)
-        f.l_type = F_RDLCK;
-    if (cmd & LOCK_EX)
-        f.l_type = F_WRLCK;
-
-    return fcntl(fd, (cmd & LOCK_NB) ? F_SETLK : F_SETLKW, &f);
-}
-
-#define flock(f,c)      emul_flock(f,c)
-#endif
-
 int Testing=0;