Add patch to fix dentry lockdep splat
This commit is contained in:
parent
f2b63222ef
commit
2a0a85581b
17
dentry-d_lockref-fix.patch
Normal file
17
dentry-d_lockref-fix.patch
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
---
|
||||||
|
fs/dcache.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/fs/dcache.c b/fs/dcache.c
|
||||||
|
index bce851dc03ef..be2bea834bf4 100644
|
||||||
|
--- a/fs/dcache.c
|
||||||
|
+++ b/fs/dcache.c
|
||||||
|
@@ -553,7 +553,7 @@ again:
|
||||||
|
}
|
||||||
|
rcu_read_unlock();
|
||||||
|
if (parent != dentry)
|
||||||
|
- spin_lock(&dentry->d_lock);
|
||||||
|
+ spin_lock_nested(&dentry->d_lock, DENTRY_D_LOCK_NESTED);
|
||||||
|
else
|
||||||
|
parent = NULL;
|
||||||
|
return parent;
|
@ -40,7 +40,7 @@ Summary: The Linux kernel
|
|||||||
# For non-released -rc kernels, this will be appended after the rcX and
|
# For non-released -rc kernels, this will be appended after the rcX and
|
||||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||||
#
|
#
|
||||||
%global baserelease 1
|
%global baserelease 2
|
||||||
%global fedora_build %{baserelease}
|
%global fedora_build %{baserelease}
|
||||||
|
|
||||||
# base_sublevel is the kernel version we're starting with and patching
|
# base_sublevel is the kernel version we're starting with and patching
|
||||||
@ -641,6 +641,8 @@ Patch25071: s390-appldata-add-slab.h-for-kzalloc-kfree.patch
|
|||||||
# CVE-2014-3917 rhbz 1102571 1102715
|
# CVE-2014-3917 rhbz 1102571 1102715
|
||||||
Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
|
Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
|
||||||
|
|
||||||
|
Patch25094: dentry-d_lockref-fix.patch
|
||||||
|
|
||||||
# END OF PATCH DEFINITIONS
|
# END OF PATCH DEFINITIONS
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -1358,6 +1360,8 @@ ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch
|
|||||||
# CVE-2014-3917 rhbz 1102571 1102715
|
# CVE-2014-3917 rhbz 1102571 1102715
|
||||||
ApplyPatch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
|
ApplyPatch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch
|
||||||
|
|
||||||
|
ApplyPatch dentry-d_lockref-fix.patch
|
||||||
|
|
||||||
# END OF PATCH APPLICATIONS
|
# END OF PATCH APPLICATIONS
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
@ -2228,6 +2232,9 @@ fi
|
|||||||
# ||----w |
|
# ||----w |
|
||||||
# || ||
|
# || ||
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat May 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git4.2
|
||||||
|
- Add patch to fix dentry lockdep splat
|
||||||
|
|
||||||
* Sat May 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git4.1
|
* Sat May 31 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.15.0-0.rc7.git4.1
|
||||||
- Linux v3.15-rc7-102-g1487385edb55
|
- Linux v3.15-rc7-102-g1487385edb55
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user