diff options
| -rw-r--r-- | source3/modules/vfs_default.c | 5 | ||||
| -rw-r--r-- | source3/smbd/oplock_linux.c | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index b387cce109..eb3e343495 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -1573,11 +1573,6 @@ static int vfswrap_linux_setlease(vfs_handle_struct *handle, files_struct *fsp, START_PROFILE(syscall_linux_setlease); #ifdef HAVE_KERNEL_OPLOCKS_LINUX - /* first set the signal handler */ - if(linux_set_lease_sighandler(fsp->fh->fd) == -1) { - return -1; - } - result = linux_setlease(fsp->fh->fd, leasetype); #else errno = ENOSYS; diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 190578e0cc..7fa9b7cb2c 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -76,9 +76,22 @@ int linux_setlease(int fd, int leasetype) { int ret; + /* First set the signal handler. */ + if (linux_set_lease_sighandler(fd) == -1) { + return -1; + } ret = fcntl(fd, F_SETLEASE, leasetype); if (ret == -1 && errno == EACCES) { set_effective_capability(LEASE_CAPABILITY); + /* + * Bug 8974 - work around Linux kernel bug + * https://bugzilla.kernel.org/show_bug.cgi?id=43336. + * "fcntl(F_SETLEASE) resets signal number when + * called multiple times" + */ + if (linux_set_lease_sighandler(fd) == -1) { + return -1; + } ret = fcntl(fd, F_SETLEASE, leasetype); } |