summaryrefslogtreecommitdiffstats
path: root/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 12:41:27 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-03-02 15:43:55 +0100
commit93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd (patch)
tree4fb2d20f48851f8f9fd4a295057181d2739c7a99 /patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
parent10e3605477abfabab01fa60c320fff7e6d5776e8 (diff)
downloadptxdist-93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd.tar.gz
ptxdist-93fce3eef4fc5ed7fa987cdaeefc83b1afb224bd.tar.xz
samba: version bump 3.0.37 -> 4.9.4
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch')
-rw-r--r--patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch b/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
deleted file mode 100644
index 0cee2ecfa..000000000
--- a/patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Subject: [samba] make oplock support conditional
-
-Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX, not
-plain old LINUX.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
- source/modules/vfs_default.c | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-# 20100428 rsc: This patch was already applied in the samba upstream, see
-# http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962
-# and d8d84cd7082a95e673a7efc285879dd412b78b4c in samba git.
-
-diff --git a/source/modules/vfs_default.c b/source/modules/vfs_default.c
-index 4cc6e88..1f8fb63 100644
---- a/source/modules/vfs_default.c
-+++ b/source/modules/vfs_default.c
-@@ -813,10 +813,11 @@ static int vfswrap_linux_setlease(vfs_handle_struct *handle, files_struct *fsp,
-
- START_PROFILE(syscall_linux_setlease);
-
--#ifdef LINUX
-+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
- /* first set the signal handler */
-- if(linux_set_lease_sighandler(fd) == -1)
-+ if(linux_set_lease_sighandler(fd) == -1) {
- return -1;
-+ }
-
- result = linux_setlease(fd, leasetype);
- #else
---
-1.6.3.3
-