SOURCES (LINUX_2_6): kernel-apparmor.patch - up for 2.6.25.7

[arekm]

Author: arekm                        Date: Mon Jun 16 21:33:10 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- up for 2.6.25.7

---- Files affected:
SOURCES:
   kernel-apparmor.patch (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SOURCES/kernel-apparmor.patch
diff -u SOURCES/kernel-apparmor.patch:1.1.2.3 SOURCES/kernel-apparmor.patch:1.1.2.4
--- SOURCES/kernel-apparmor.patch:1.1.2.3	Mon Jun  9 16:01:09 2008
+++ SOURCES/kernel-apparmor.patch	Mon Jun 16 23:33:04 2008
@@ -385,13 +385,13 @@
  		goto out_lock;
  	rc = ecryptfs_interpose(lower_new_dentry, new_dentry, dir->i_sb, 0);
 @@ -425,10 +430,11 @@ static int ecryptfs_unlink(struct inode 
- {
  	int rc = 0;
  	struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
 +	struct vfsmount *lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
  	struct inode *lower_dir_inode = ecryptfs_inode_to_lower(dir);
+ 	struct dentry *lower_dir_dentry;
  
- 	lock_parent(lower_dentry);
+ 	lower_dir_dentry = lock_parent(lower_dentry);
 -	rc = vfs_unlink(lower_dir_inode, lower_dentry, NULL);
 +	rc = vfs_unlink(lower_dir_inode, lower_dentry, NULL, lower_mnt);
  	if (rc) {
@@ -514,15 +514,15 @@
  	mutex_lock(&crypt_stat->cs_mutex);
  	if (S_ISDIR(dentry->d_inode->i_mode))
  		crypt_stat->flags &= ~(ECRYPTFS_ENCRYPTED);
-@@ -908,7 +931,7 @@ static int ecryptfs_setattr(struct dentr
- 	if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID))
+@@ -927,7 +927,7 @@
  		ia->ia_valid &= ~ATTR_MODE;
  
+ 	mutex_lock(&lower_dentry->d_inode->i_mutex);
 -	rc = notify_change(lower_dentry, ia);
 +	rc = notify_change(lower_dentry, lower_mnt, ia);
+ 	mutex_unlock(&lower_dentry->d_inode->i_mutex);
  out:
- 	fsstack_copy_attr_all(inode, lower_inode, NULL);
- 	return rc;
+ 	fsstack_copy_attr_all(inode, lower_inode);
 diff -uprN e/fs/exec.c f/fs/exec.c
 --- e/fs/exec.c	2008-04-17 02:49:44.000000000 +0000
 +++ f/fs/exec.c	2008-05-28 20:29:28.910241000 +0000
================================================================

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