Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove ulockmgr #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove ulockmgr #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cicpoffs:
${CXX} --std=c++17 cicpps.cpp fuse_launcher_gpl2.cpp -o cicpoffs -O2 -Wall $(shell pkg-config fuse3 libattr --cflags --libs) -lulockmgr -fPIC ${CXX_FLAGS}
${CXX} --std=c++17 cicpps.cpp fuse_launcher_gpl2.cpp -o cicpoffs -O2 -Wall $(shell pkg-config fuse3 libattr --cflags --libs) -fPIC ${CXX_FLAGS}

install:
install -Dm755 cicpoffs ${DESTDIR}/usr/bin/cicpoffs
Expand Down
6 changes: 0 additions & 6 deletions cicpoffs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "cicpoffs.hpp"
#include "cicpps.hpp"
extern "C"{
#include <ulockmgr.h>
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
Expand Down Expand Up @@ -63,7 +62,6 @@ static struct fuse_operations operations = {
.create = fuse_fn_create,
//.ftruncate = fuse_fn_ftruncate,
//.fgetattr = fuse_fn_fgetattr,
.lock = fuse_fn_lock,
.utimens = fuse_fn_utimens,
//.bmap = <unimplemented> - not for block devices,
//.ioctl = fuse_fn_ioctl,
Expand Down Expand Up @@ -330,10 +328,6 @@ int (fuse_fn_fgetattr) (const char* path, struct stat* st, struct fuse_file
return retval;
};

int (fuse_fn_lock) (const char* path, struct fuse_file_info* ffi, int cmd, struct flock* lock){
return ulockmgr_op(ffi->fh, cmd, lock, &ffi->lock_owner, sizeof(ffi->lock_owner));
};

int (fuse_fn_utimens) (const char* path, const struct timespec ts[2], struct fuse_file_info* ffi){
struct timeval tv[2];
tv[0].tv_sec = ts[0].tv_sec;
Expand Down
1 change: 0 additions & 1 deletion cicpoffs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ int (fuse_fn_access) (const char*, int);
int (fuse_fn_create) (const char*, mode_t, struct fuse_file_info*);
//int (fuse_fn_ftruncate) (const char*, off_t, struct fuse_file_info*);
//int (fuse_fn_fgetattr) (const char*, struct stat*, struct fuse_file_info*);
int (fuse_fn_lock) (const char*, struct fuse_file_info*, int, struct flock*);
int (fuse_fn_utimens) (const char*, const struct timespec[2], struct fuse_file_info*);
int (fuse_fn_bmap) (const char*, size_t, uint64_t*);
int (fuse_fn_ioctl) (const char*, int, void*, struct fuse_file_info*, unsigned int, void*);
Expand Down