SOURCES (LINUX_2_6): kernel-apparmor-after-grsec_full.patch - updated ecryp...

[baggins]

Author: baggins                      Date: Thu Mar 12 23:11:43 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated ecryptfs changes for AUFS

---- Files affected:
SOURCES:
   kernel-apparmor-after-grsec_full.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor-after-grsec_full.patch
diff -u SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.5 SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.6
--- SOURCES/kernel-apparmor-after-grsec_full.patch:1.1.2.5	Sun Feb  8 20:47:53 2009
+++ SOURCES/kernel-apparmor-after-grsec_full.patch	Fri Mar 13 00:11:37 2009
@@ -363,7 +363,7 @@
  	if (rc || !lower_new_dentry->d_inode)
  		goto out_lock;
  	rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
-@@ -440,11 +445,12 @@ static int ecryptfs_unlink(struct inode 
+@@ -440,13 +445,14 @@ static int ecryptfs_unlink(struct inode 
  {
  	int rc = 0;
  	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
@@ -372,11 +372,13 @@
  	struct dentry *lower_dir_dentry;
  
  	lower_dir_dentry = lock_parent(lower_dentry);
+ 	dget(lower_dentry);
+ 	atomic_inc(&lower_dentry->d_inode->i_count);
 -	rc = vfs_unlink(lower_dir_inode, lower_dentry);
 +	rc = vfs_unlink(lower_dir_inode, lower_dentry, lower_mnt);
+ 	dput(lower_dentry);
  	if (rc) {
  		printk(KERN_ERR "Error in vfs_unlink; rc = [%d]\n", rc);
- 		goto out_unlock;
 @@ -464,6 +470,7 @@ static int ecryptfs_symlink(struct inode
  {
  	int rc;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-apparmor-after-grsec_full.patch?r1=1.1.2.5&r2=1.1.2.6&f=u