[packages/kernel] - revert broken hunk in vserver patch

baggins baggins at pld-linux.org
Fri Apr 25 20:51:01 CEST 2014


commit fcb44bf1964b3ecd87e12f7165432a9130fdc63c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 25 20:47:04 2014 +0200

    - revert broken hunk in vserver patch
    
    After the following change that went into 3.13.9 and 3.14+, vserver
    enabled kernels couldn't boot anymore, hanging at the first interaction
    with udev in initrd. Reverting the change to follow_dotdot() in
    fs/namei.c makes the kernel boot again without problems.
    
     From b37199e626b31e1175fb06764c5d1d687723aac2 Mon Sep 17 00:00:00 2001
     From: Al Viro <viro at zeniv.linux.org.uk>
     Date: Thu, 20 Mar 2014 15:18:22 -0400
     Subject: rcuwalk: recheck mount_lock after mountpoint crossing attempts

 kernel-vserver-fixes.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)
---
diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index b46a561..61a0931 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -9,3 +9,15 @@
  	if (pid->hide_pid < hide_pid_min)
  		return true;
  	if (in_group_p(pid->pid_gid))
+--- linux-3.13.10/fs/namei.c	2014-04-17 01:12:32.000000000 +0000
++++ linux-3.13.10-vs2.3.6.11/fs/namei.c	2014-04-17 01:17:10.000000000 +0000
+@@ -1238,8 +1335,7 @@ static void follow_dotdot(struct nameida
+ 
+ 		if (nd->path.dentry == nd->root.dentry &&
+ 		    nd->path.mnt == nd->root.mnt) {
+-			/* for sane '/' avoid follow_mount() */
+-			return;
++			break;
+ 		}
+ 		if (nd->path.dentry != nd->path.mnt->mnt_root) {
+ 			/* rare case of legitimate dget_parent()... */
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/fcb44bf1964b3ecd87e12f7165432a9130fdc63c



More information about the pld-cvs-commit mailing list