summaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
Diffstat (limited to 'patches')
-rw-r--r--patches/samba-3.0.37/0001-Linux-oplock-support-is-conditional-on-HAVE_KERNEL_O.patch14
1 files changed, 10 insertions, 4 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
index ee4c6f2a8..0cee2ecfa 100644
--- 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
@@ -1,13 +1,19 @@
-From d8d84cd7082a95e673a7efc285879dd412b78b4c Mon Sep 17 00:00:00 2001
From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Tue, 7 Jul 2009 15:56:56 +0200
-Subject: [PATCH 1/8] Linux oplock support is conditional on HAVE_KERNEL_OPLOCKS_LINUX, not plain old LINUX.
+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>
-http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23962
---
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