From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Oct 2011 07:45:31 +0000 (+0200)
Subject: Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security
X-Git-Tag: v3.2-rc1~190
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36b8d186e6cc8e32cb5227f5645a58e1bc0af190;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security

* 'next' of git://selinuxproject.org/~jmorris/linux-security: (95 commits)
  TOMOYO: Fix incomplete read after seek.
  Smack: allow to access /smack/access as normal user
  TOMOYO: Fix unused kernel config option.
  Smack: fix: invalid length set for the result of /smack/access
  Smack: compilation fix
  Smack: fix for /smack/access output, use string instead of byte
  Smack: domain transition protections (v3)
  Smack: Provide information for UDS getsockopt(SO_PEERCRED)
  Smack: Clean up comments
  Smack: Repair processing of fcntl
  Smack: Rule list lookup performance
  Smack: check permissions from user space (v2)
  TOMOYO: Fix quota and garbage collector.
  TOMOYO: Remove redundant tasklist_lock.
  TOMOYO: Fix domain transition failure warning.
  TOMOYO: Remove tomoyo_policy_memory_lock spinlock.
  TOMOYO: Simplify garbage collector.
  TOMOYO: Fix make namespacecheck warnings.
  target: check hex2bin result
  encrypted-keys: check hex2bin result
  ...
---

36b8d186e6cc8e32cb5227f5645a58e1bc0af190
diff --cc Documentation/kernel-parameters.txt
index d6e6724,cd7c8611..d317f6c
--- 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 673704f,3719460..28856ac
--- 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