From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Sep 2011 04:27:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'security/next'
X-Git-Tag: next-20110909~33
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4b8f7b94b7fe5e43848bf0e1a9df687181f9f986;p=karo-tx-linux.git

Merge remote-tracking branch 'security/next'

Conflicts:
	fs/ocfs2/xattr.c
---

4b8f7b94b7fe5e43848bf0e1a9df687181f9f986
diff --cc Documentation/kernel-parameters.txt
index 0c412ff39862,cd7c86110147..e54ec2d14aac
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,8 -48,8 +49,9 @@@ parameter is applicable
  	EDD	BIOS Enhanced Disk Drive Services (EDD) is enabled
  	EFI	EFI Partitioning (GPT) is enabled
  	EIDE	EIDE/ATAPI support is enabled.
+ 	EVM	Extended Verification Module
  	FB	The frame buffer device is enabled.
 +	FTRACE	Function tracing enabled.
  	GCOV	GCOV profiling is enabled.
  	HW	Appropriate hardware is enabled.
  	IA-64	IA-64 architecture is enabled.
diff --cc fs/xfs/xfs_iops.c
index e041e917c1d9,37194607162d..6a115322024f
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@@ -95,13 -92,25 +95,30 @@@ xfs_mark_inode_dirty
  
  	if (!(inode->i_state & (I_WILL_FREE|I_FREEING)))
  		mark_inode_dirty(inode);
 +	else {
 +		barrier();
 +		ip->i_update_core = 1;
 +	}
 +
  }
  
+ 
+ int xfs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
+ 		   void *fs_info)
+ {
+ 	const struct xattr *xattr;
+ 	struct xfs_inode *ip = XFS_I(inode);
+ 	int error = 0;
+ 
+ 	for (xattr = xattr_array; xattr->name != NULL; xattr++) {
+ 		error = xfs_attr_set(ip, xattr->name, xattr->value,
+ 				     xattr->value_len, ATTR_SECURE);
+ 		if (error < 0)
+ 			break;
+ 	}
+ 	return error;
+ }
+ 
  /*
   * Hook in SELinux.  This is not quite correct yet, what we really need
   * here (as we do for default ACLs) is a mechanism by which creation of