rpms/kernel/F-12 btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch, 1.1, 1.2 btrfs-should-add-permission-check-for-setfacl.patch, 1.1, 1.2 kernel.spec, 1.2095, 1.2096

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2252

Modified Files:
	btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch 
	btrfs-should-add-permission-check-for-setfacl.patch 
	kernel.spec 
Log Message:
* Tue Jun 15 2010 Kyle McMartin <kyle at redhat.com>  2.6.32.14-134
- Fix btrfs ACL fixes... commit 431547b3c4533b8c7fd150ab36980b9a3147797b
  changed them to take a struct dentry instead of struct inode after
  2.6.32.


btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch:
 acl.c |    3 +++
 1 file changed, 3 insertions(+)

Index: btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch	14 Jun 2010 10:04:30 -0000	1.1
+++ btrfs-prohibit-a-operation-of-changing-acls-mask-when-noacl-mount-option-is-used.patch	15 Jun 2010 19:10:16 -0000	1.2
@@ -31,10 +31,10 @@ index 6b4d0cc..a372985 100644
 --- a/fs/btrfs/acl.c
 +++ b/fs/btrfs/acl.c
 @@ -163,6 +163,9 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
- 	if (!is_owner_or_cap(dentry->d_inode))
+ 	if (!is_owner_or_cap(inode))
  		return -EPERM;
  
-+	if (!IS_POSIXACL(dentry->d_inode))
++	if (!IS_POSIXACL(inode))
 +		return -EOPNOTSUPP;
 +
  	if (value) {

btrfs-should-add-permission-check-for-setfacl.patch:
 acl.c |    3 +++
 1 file changed, 3 insertions(+)

Index: btrfs-should-add-permission-check-for-setfacl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/btrfs-should-add-permission-check-for-setfacl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- btrfs-should-add-permission-check-for-setfacl.patch	14 Jun 2010 10:04:30 -0000	1.1
+++ btrfs-should-add-permission-check-for-setfacl.patch	15 Jun 2010 19:10:16 -0000	1.2
@@ -45,7 +45,7 @@ index 6ef7b26..6b4d0cc 100644
  	int ret = 0;
  	struct posix_acl *acl = NULL;
  
-+	if (!is_owner_or_cap(dentry->d_inode))
++	if (!is_owner_or_cap(inode))
 +		return -EPERM;
 +
  	if (value) {


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2095
retrieving revision 1.2096
diff -u -p -r1.2095 -r1.2096
--- kernel.spec	15 Jun 2010 18:40:33 -0000	1.2095
+++ kernel.spec	15 Jun 2010 19:10:16 -0000	1.2096
@@ -2197,10 +2197,15 @@ fi
 
 
 %changelog
-* Tue Jun 15 2010 John W. Linville <linville at redhat.com> 2.6.32-14-133
+* Tue Jun 15 2010 Kyle McMartin <kyle at redhat.com>  2.6.32.14-134
+- Fix btrfs ACL fixes... commit 431547b3c4533b8c7fd150ab36980b9a3147797b
+  changed them to take a struct dentry instead of struct inode after
+  2.6.32.
+
+* Tue Jun 15 2010 John W. Linville <linville at redhat.com> 2.6.32.14-133
 - iwlwifi: cancel scan watchdog in iwl_bg_abort_scan (#604264)
 
-* Mon Jun 14 2010 Kyle McMartin <kyle at redhat.com> 2.6.32-14-132
+* Mon Jun 14 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.14-132
 - Add in ACL fixes to btrfs from CVE-2010-2071.
 
 * Sun Jun 13 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.14-131