diff options
| -rw-r--r-- | dentry-d_lockref-fix.patch | 17 | ||||
| -rw-r--r-- | kernel.spec | 9 |
2 files changed, 25 insertions, 1 deletions
diff --git a/dentry-d_lockref-fix.patch b/dentry-d_lockref-fix.patch new file mode 100644 index 000000000..5a97c2539 --- /dev/null +++ b/dentry-d_lockref-fix.patch @@ -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; diff --git a/kernel.spec b/kernel.spec index 2dd8f7454..77ac0d6ed 100644 --- a/kernel.spec +++ b/kernel.spec @@ -40,7 +40,7 @@ Summary: The Linux kernel # 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" # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # 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 Patch25093: auditsc-audit_krule-mask-accesses-need-bounds-checking.patch +Patch25094: dentry-d_lockref-fix.patch + # END OF PATCH DEFINITIONS %endif @@ -1358,6 +1360,8 @@ ApplyPatch s390-appldata-add-slab.h-for-kzalloc-kfree.patch # CVE-2014-3917 rhbz 1102571 1102715 ApplyPatch auditsc-audit_krule-mask-accesses-need-bounds-checking.patch +ApplyPatch dentry-d_lockref-fix.patch + # END OF PATCH APPLICATIONS %endif @@ -2228,6 +2232,9 @@ fi # ||----w | # || || %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 - Linux v3.15-rc7-102-g1487385edb55 |