diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:09:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 15:09:21 +1100 |
| commit | 14fb23e5b670f3a314f10206e9643a10f46a91f2 (patch) | |
| tree | f8a0b5cbd91bb591c88d293b1a382115b50356c4 /mm | |
| parent | 085966022d51faac8ecb4be286258eed12398830 (diff) | |
| parent | 0b24dcb7f2f7a0ce9b762eef0362c21c88f47b32 (diff) | |
Merge remote-tracking branch 'selinux/master'
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/shmem.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5ee67c990602..7c9cdc6fe137 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1843,8 +1843,9 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev) inode = shmem_get_inode(dir->i_sb, dir, mode, dev, VM_NORESERVE); if (inode) { - error = security_inode_init_security(inode, dir, NULL, NULL, - NULL); + error = security_inode_init_security(inode, dir, + &dentry->d_name, NULL, + NULL, NULL); if (error) { if (error != -EOPNOTSUPP) { iput(inode); @@ -1983,8 +1984,8 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s if (!inode) return -ENOSPC; - error = security_inode_init_security(inode, dir, NULL, NULL, - NULL); + error = security_inode_init_security(inode, dir, &dentry->d_name, NULL, + NULL, NULL); if (error) { if (error != -EOPNOTSUPP) { iput(inode); |