diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-06-11 05:57:58 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-06-11 05:57:58 +0000 |
| commit | 8843a6379d7c1cf59f0f3673cbc567b09994b7d2 (patch) | |
| tree | 63f645769adeecd6cfd999a8f2d873f1c5a626b6 /source3/include | |
| parent | 4ec7597d1154c60f0f55feab93f2dc9c776d56f8 (diff) | |
| download | samba-8843a6379d7c1cf59f0f3673cbc567b09994b7d2.tar.gz samba-8843a6379d7c1cf59f0f3673cbc567b09994b7d2.tar.bz2 samba-8843a6379d7c1cf59f0f3673cbc567b09994b7d2.zip | |
Linux kernel oplocks now seem to work, but need a _lot_ of testing
I had to modify sys_select() to not loop on EINTR. I added a wrapper
called sys_select_intr() which gives the old behaviour.
(This used to be commit b28cc4163bc2faaa80c5782fc02c8f03c410cdeb)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/includes.h | 12 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 432fd09f0b..a30a8448ad 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -868,6 +868,18 @@ int setresgid(gid_t rgid, gid_t egid, gid_t sgid); #include <dlfcn.h> #endif +#if HAVE_KERNEL_OPLOCKS_LINUX +#ifndef F_SETLEASE +#define F_SETLEASE 1024 +#endif +#ifndef F_GETLEASE +#define F_GETLEASE 1025 +#endif +#ifndef CAP_LEASE +#define CAP_LEASE 28 +#endif +#endif + extern int DEBUGLEVEL; #endif /* _INCLUDES_H */ diff --git a/source3/include/proto.h b/source3/include/proto.h index b6aeb19232..f874f0e1a1 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -214,6 +214,7 @@ void standard_sub_vsnum(char *str, user_struct *vuser, int snum); int sys_select(int maxfd, fd_set *fds,struct timeval *tval); int sys_select(int maxfd, fd_set *fds,struct timeval *tval); +int sys_select_intr(int maxfd, fd_set *fds,struct timeval *tval); int sys_usleep(long usecs); int sys_stat(const char *fname,SMB_STRUCT_STAT *sbuf); int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf); |