aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Miklos Szeredi <mszeredi@suse.cz>2013-07-25 17:58:48 +0200
committerGravatar Miklos Szeredi <mszeredi@suse.cz>2013-07-25 17:58:48 +0200
commit3c3f03b81f3027ef0a25bd790605265b384b93c1 (patch)
treebf3dd9c26414cb7f97f090cbc2a61062824566b2 /include
parent0cb2db32e73cb06716ea797374c42e99d782643b (diff)
ulockmgr: strip ulockmgr support from this source package
Distribute ulockmgr separately. It is not needed for the building of libfuse, only fusexmp_fh. Check ulockmgr library in ./configure and if not disable remote-lock suport in fusexmp_fh.
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am2
-rw-r--r--include/ulockmgr.h24
2 files changed, 0 insertions, 26 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index bfe91e4..ffbfafa 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,6 +9,4 @@ fuseinclude_HEADERS = \
fuse_opt.h \
cuse_lowlevel.h
-include_HEADERS = ulockmgr.h
-
noinst_HEADERS = fuse_kernel.h
diff --git a/include/ulockmgr.h b/include/ulockmgr.h
deleted file mode 100644
index ad55579..0000000
--- a/include/ulockmgr.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- libulockmgr: Userspace Lock Manager Library
- Copyright (C) 2006 Miklos Szeredi <miklos@szeredi.hu>
-
- This program can be distributed under the terms of the GNU LGPLv2.
- See the file COPYING.LIB.
-*/
-
-#include <stdint.h>
-#include <fcntl.h>
-#include <sys/types.h>
-
-/**
- * Perform POSIX locking operation
- *
- * @param fd the file descriptor
- * @param cmd the locking command (F_GETFL, F_SETLK or F_SETLKW)
- * @param lock the lock parameters
- * @param owner the lock owner ID cookie
- * @param owner_len length of the lock owner ID cookie
- * @return 0 on success -errno on error
- */
-int ulockmgr_op(int fd, int cmd, struct flock *lock, const void *owner,
- size_t owner_len);