Throughout, call fcntl64 instead of fcntl or fcntl_worker.

	* fcntl.cc (fcntl_worker): Remove.
	(fcntl64): Add fault handler.  Move fcntl_worker stuff here.  Add case
	for locking and call fhandler's lock method directly.  Make sure that
	F_FLOCK flag isn't set in lock call.
	(_fcntl): Add fault handler.
	* fhandler.cc (fhandler_base::fcntl): Drop lock cases.
	* flock.cc (flock): Add fault handler.  Simplify code.  Call fhandlers
	lock method directly instead of fcntl_worker.  Add debug output.
	(lockf): Add fault handler.  Call fhandlers lock method directly
	instead of fcntl_worker.  Add debug output.
	* winsup.h (fcntl_worker): Drop declaration.
	(fcntl64): Declare.

1 files changed, 1 insertions, 2 deletions

diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 33cdba39d..9a722778b 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -54,7 +54,7 @@ extern struct passwd *getpwnam (const char *);
 extern struct __sFILE64 *fopen64 (const char *, const char *);
 extern struct hostent *cygwin_gethostbyname (const char *name);
 extern unsigned long cygwin_inet_addr (const char *cp);
-
+extern int fcntl64 (int fd, int cmd, ...);
 #ifdef __cplusplus
 }
 #endif
@@ -324,7 +324,6 @@ int symlink_worker (const char *, const char *, bool, bool)
 
 class path_conv;
 
-int fcntl_worker (int fd, int cmd, void *arg);
 int __stdcall stat_worker (path_conv &pc, struct __stat64 *buf) __attribute__ ((regparm (2)));
 
 __ino64_t __stdcall readdir_get_ino (const char *path, bool dot_dot) __attribute__ ((regparm (2)));