diff options
| author | James Morris <jmorris@namei.org> | 2011-08-08 20:31:03 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-08-08 20:31:03 -0400 |
| commit | 5a2f3a02aea164f4f59c0c3497772090a411b462 (patch) | |
| tree | d3ebe03d4f97575290087843960baa01de3acd0a /mm | |
| parent | 1d568ab068c021672d6cd7f50f92a3695a921ffb (diff) | |
| parent | 817b54aa45db03437c6d09a7693fc6926eb8e822 (diff) | |
Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next
Conflicts:
fs/attr.c
Resolve conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 32f6763f16fb..2d3577295298 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -1458,7 +1458,7 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) | |||
| 1458 | inode = shmem_get_inode(dir->i_sb, dir, mode, dev, VM_NORESERVE); | 1458 | inode = shmem_get_inode(dir->i_sb, dir, mode, dev, VM_NORESERVE); |
| 1459 | if (inode) { | 1459 | if (inode) { |
| 1460 | error = security_inode_init_security(inode, dir, | 1460 | error = security_inode_init_security(inode, dir, |
| 1461 | &dentry->d_name, NULL, | 1461 | &dentry->d_name, |
| 1462 | NULL, NULL); | 1462 | NULL, NULL); |
| 1463 | if (error) { | 1463 | if (error) { |
| 1464 | if (error != -EOPNOTSUPP) { | 1464 | if (error != -EOPNOTSUPP) { |
| @@ -1598,7 +1598,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s | |||
| 1598 | if (!inode) | 1598 | if (!inode) |
| 1599 | return -ENOSPC; | 1599 | return -ENOSPC; |
| 1600 | 1600 | ||
| 1601 | error = security_inode_init_security(inode, dir, &dentry->d_name, NULL, | 1601 | error = security_inode_init_security(inode, dir, &dentry->d_name, |
| 1602 | NULL, NULL); | 1602 | NULL, NULL); |
| 1603 | if (error) { | 1603 | if (error) { |
| 1604 | if (error != -EOPNOTSUPP) { | 1604 | if (error != -EOPNOTSUPP) { |