add fix for openvz bug #2242

diff --git a/Makefile b/Makefile
index be071832b199843df48c25d7cf7b2f78d1a52c2d..488e0b4899e2dd7ea3e8230619c4b8c7b6430aaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.2
 
 KERNEL_VER=2.6.32
-PKGREL=122
+PKGREL=123
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=28
@@ -153,6 +153,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cp -a ${KERNEL_SRC}.org ${KERNEL_SRC}
        cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31-rh.patch
        cd ${KERNEL_SRC}; patch -p1 <../${RHKERSRCDIR}/patch-042stab085
+       cd ${KERNEL_SRC}; patch -p1 <../cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch
        cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
        cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
        #cd ${KERNEL_SRC}; patch -p1 <../kvm-fix-invalid-secondary-exec-controls.patch

diff --git a/changelog.Debian b/changelog.Debian
index 023f47a8ec998ad38f7c2bbce6030ac01e493f97..e2e3e91b33d38fd7044df88ca5d6e3fdf388813a 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,10 @@
+pve-kernel-2.6.32 (2.6.32-123) unstable; urgency=low
+
+  * add fix for openvz bug #2242   
+    cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch
+
+ -- Proxmox Support Team <support@proxmox.com>  Tue, 18 Mar 2014 15:05:06 +0100
+
 pve-kernel-2.6.32 (2.6.32-122) unstable; urgency=low
 
   * update to vzkernel-2.6.32-042stab085.17.src.rpm 

diff --git a/cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch b/cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch
new file mode 100644 (file)
index 0000000..37bc8c2
--- /dev/null
+++ b/cpt-drop-DCACHE_NFSFS_RENAMED-for-all-NFS-dentries-on-kill.patch
@@ -0,0 +1,32 @@
+cpt: drop DCACHE_NFSFS_RENAMED for all NFS dentries on kill
+
+From: Stanislav Kinsbursky <skinsbursky@parallels.com>
+
+No need to check for dentry is hashed: things are changing and silly-renamed
+dentries are hashed now.
+And no need to check for dentry belongs to NFS mount: flag
+DCACHE_NFSFS_RENAMED is set only for NFS dentries.
+
+https://bugzilla.openvz.org/show_bug.cgi?id=2242
+
+Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
+---
+ kernel/cpt/cpt_dump.c |    5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/kernel/cpt/cpt_dump.c b/kernel/cpt/cpt_dump.c
+index 6f5fda3..ab069a6 100644
+--- a/kernel/cpt/cpt_dump.c
++++ b/kernel/cpt/cpt_dump.c
+@@ -442,11 +442,6 @@ void cpt_drop_nfs_unhashed(struct cpt_context *ctx)
+               struct file *file = obj->o_obj;
+               struct dentry *d = file->f_dentry;
+ 
+-              if (IS_ROOT(d) || !d_unhashed(d))
+-                      continue;
+-              if (d->d_sb->s_magic != FSMAGIC_NFS)
+-                      continue;
+-
+               if (d->d_flags & DCACHE_NFSFS_RENAMED) {
+                       spin_lock(&d->d_lock);
+                       d->d_flags &= ~DCACHE_NFSFS_RENAMED;