From: James Morris <jmorris@namei.org>
Date: Tue, 9 Aug 2011 00:31:03 +0000 (+1000)
Subject: Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima... 
X-Git-Tag: upstream/snapshot3+hdmi~8838^2~66
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5a2f3a02aea164f4f59c0c3497772090a411b462;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'next-evm' of git://git./linux/kernel/git/zohar/ima-2.6 into next

Conflicts:
	fs/attr.c

Resolve conflict manually.

Signed-off-by: James Morris <jmorris@namei.org>
---

5a2f3a02aea164f4f59c0c3497772090a411b462
diff --cc fs/attr.c
index 538e279,5ad45d3..7ee7ba4
--- a/fs/attr.c
+++ b/fs/attr.c
@@@ -237,8 -241,13 +238,10 @@@ int notify_change(struct dentry * dentr
  	else
  		error = simple_setattr(dentry, attr);
  
- 	if (!error)
 -	if (ia_valid & ATTR_SIZE)
 -		up_write(&dentry->d_inode->i_alloc_sem);
 -
+ 	if (!error) {
  		fsnotify_change(dentry, ia_valid);
+ 		evm_inode_post_setattr(dentry, ia_valid);
+ 	}
  
  	return error;
  }