Remove abandoned patch

See https://gerrit.openafs.org/#/c/12267/

3 files changed, 3 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ea80f9a1e1a..28d38f82d13d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri May  6 19:10:53 UTC 2016
+# Thu May 12 05:54:25 UTC 2016
 pkgbase = openafs-modules-dkms
 	pkgdesc = Kernel module for OpenAFS (dkms)
 	pkgver = 1.6.18
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.openafs.org
 	arch = i686
 	arch = x86_64
@@ -21,14 +21,12 @@ pkgbase = openafs-modules-dkms
 	source = 0001-Linux-3.13-Check-return-value-from-bdi_init.patch
 	source = 0002-Linux-4.5-no-highmem-in-symlink-ops.patch
 	source = 0003-Linux-4.5-get_link-instead-of-follow_link-put_link.patch
-	source = 0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch
 	source = 0005-Linux-4.5-don-t-access-i_mutex-directly.patch
 	sha256sums = b3c35e7be6b6c86b91e7c699fd015f53c87bc19d1ae8ec3ec9cda6b97327d3b6
 	sha256sums = ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf
 	sha256sums = bec998ce038349025fe030c692f7f0fe46bbe8922433cf6be6298aac536f34cf
 	sha256sums = d18b1278c097825801fa1c721cae861f985d9da5460475b74cefe1eb789a1f92
 	sha256sums = 6336dde35c68c74ae9427b312f170481616d8d347ec4ddfa2966a683797361b0
-	sha256sums = fa485ab7a54499eb87b91ec8ea3f33e0894e9e4dc1d0bb825d5ac84a2f3cbc93
 	sha256sums = e3f369f000df13a4d207c1533d63ffa0b139c3d374294f6d1fbc77f5e5b9b4df
 
 pkgname = openafs-modules-dkms
diff --git a/0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch b/0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch
deleted file mode 100644
index 52856dcbcc56..000000000000
--- a/0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a42d68d51dc8c864cf5fde02a8f0277e82ca8696 Mon Sep 17 00:00:00 2001
-From: Benjamin Kaduk <kaduk@mit.edu>
-Date: Sun, 1 May 2016 19:39:55 -0400
-Subject: [PATCH 4/5] Linux: lock the parent dentry for lookup_one_len()
-
-During review of the changes in Linux 4.5, it was noted that
-callers of lookup_one_len() are obligated to hold the i_mutex
-on the parent directory, though we do not currently do so.
-Take the lock around the call as needed.
-
-The only call to lookup_one_len() occurs in afs_linux_sillyrename(),
-so may workloads may not encounter this codepath.
-
-Change-Id: I4d566c9a704173973c062c3d38f1d481f76c42da
----
- src/afs/LINUX/osi_vnodeops.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/afs/LINUX/osi_vnodeops.c b/src/afs/LINUX/osi_vnodeops.c
-index 00b41ef..532c9e9 100644
---- a/src/afs/LINUX/osi_vnodeops.c
-+++ b/src/afs/LINUX/osi_vnodeops.c
-@@ -1654,7 +1654,9 @@ afs_linux_sillyrename(struct inode *dir, struct dentry *dentry,
- 	__name = afs_newname();
- 	AFS_GUNLOCK();
- 
-+	afs_linux_lock_inode(dentry->d_parent->d_inode);
- 	__dp = lookup_one_len(__name, dentry->d_parent, strlen(__name));
-+	afs_linux_unlock_inode(dentry->d_parent->d_inode);
- 
- 	if (IS_ERR(__dp)) {
- 	    osi_FreeSmallSpace(__name);
--- 
-2.8.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 8e672ce0ea32..7870ecdce013 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=openafs-modules-dkms
 _srcname=openafs
 pkgver=1.6.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel module for OpenAFS (dkms)"
 arch=('i686' 'x86_64' 'armv7h')
 url="http://www.openafs.org"
@@ -20,14 +20,12 @@ source=(http://openafs.org/dl/${pkgver}/${_srcname}-${pkgver}-src.tar.bz2
         0001-Linux-3.13-Check-return-value-from-bdi_init.patch
         0002-Linux-4.5-no-highmem-in-symlink-ops.patch
         0003-Linux-4.5-get_link-instead-of-follow_link-put_link.patch
-        0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch
         0005-Linux-4.5-don-t-access-i_mutex-directly.patch)
 sha256sums=('b3c35e7be6b6c86b91e7c699fd015f53c87bc19d1ae8ec3ec9cda6b97327d3b6'
             'ea7d1e6dfb5006016e25738be722c8793765f52ad55c0bbf588dd7fdf2bdd2bf'
             'bec998ce038349025fe030c692f7f0fe46bbe8922433cf6be6298aac536f34cf'
             'd18b1278c097825801fa1c721cae861f985d9da5460475b74cefe1eb789a1f92'
             '6336dde35c68c74ae9427b312f170481616d8d347ec4ddfa2966a683797361b0'
-            'fa485ab7a54499eb87b91ec8ea3f33e0894e9e4dc1d0bb825d5ac84a2f3cbc93'
             'e3f369f000df13a4d207c1533d63ffa0b139c3d374294f6d1fbc77f5e5b9b4df')
 
 prepare() {
@@ -37,7 +35,6 @@ prepare() {
   patch -p1 < ${srcdir}/0001-Linux-3.13-Check-return-value-from-bdi_init.patch
   patch -p1 < ${srcdir}/0002-Linux-4.5-no-highmem-in-symlink-ops.patch
   patch -p1 < ${srcdir}/0003-Linux-4.5-get_link-instead-of-follow_link-put_link.patch
-  patch -p1 < ${srcdir}/0004-Linux-lock-the-parent-dentry-for-lookup_one_len.patch
   patch -p1 < ${srcdir}/0005-Linux-4.5-don-t-access-i_mutex-directly.patch
 
   # Only needed when changes to configure were made