[kernel] r15563 - dists/lenny-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Tue Apr 27 06:48:29 2010
New Revision: 15563

Log:
fix application

Modified:
   dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Apr 27 06:06:50 2010	(r15562)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Tue Apr 27 06:48:29 2010	(r15563)
@@ -9391,6 +9391,14 @@
  	path->mnt = mnt;
  	path->dentry = dentry;
  	__follow_mount(path);
+@@ -875,6 +903,7 @@ fail:
+ static inline int follow_on_final(struct inode *inode, unsigned lookup_flags)
+ {
+ 	return inode && unlikely(inode->i_op->follow_link) &&
++		!(lookup_flags & LOOKUP_STRICT) &&
+ 		((lookup_flags & LOOKUP_FOLLOW) || S_ISDIR(inode->i_mode));
+ }
+ 
 @@ -872,6 +900,7 @@ static int __link_path_walk(const char *name, struct nameidata *nd)
  	struct inode *inode;
  	int err;
@@ -9417,14 +9425,6 @@
  			err = do_follow_link(&next, nd);
  			if (err)
  				goto return_err;
-@@ -1003,6 +1036,7 @@ last_component:
- 			break;
- 		inode = next.dentry->d_inode;
- 		if ((lookup_flags & LOOKUP_FOLLOW)
-+		    && !(lookup_flags & LOOKUP_STRICT)
- 		    && inode && inode->i_op && inode->i_op->follow_link) {
- 			err = do_follow_link(&next, nd);
- 			if (err)
 @@ -1024,27 +1058,41 @@ lookup_parent:
  		nd->last_type = LAST_NORM;
  		if (this.name[0] != '.')