diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 10:51:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 10:51:11 -0700 |
| commit | f539abece1b7e36fae6add4f9ea29203d40badcb (patch) | |
| tree | 786c08f3131a1871ece13343c3fa3832930c1408 /fs/dcache.c | |
| parent | 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304 (diff) | |
| parent | 24ff6663ccfdaf088dfa7acae489cb11ed4f43c4 (diff) | |
| download | linux-f539abece1b7e36fae6add4f9ea29203d40badcb.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
fs: call security_d_instantiate in d_obtain_alias V2
lose 'mounting_here' argument in ->d_manage()
don't pass 'mounting_here' flag to follow_down()
change the locking order for namespace_sem
fix deadlock in pivot_root()
vfs: split off vfsmount-related parts of vfs_kern_mount()
Some fixes for pstore
kill simple_set_mnt()
Diffstat (limited to 'fs/dcache.c')
| -rw-r--r-- | fs/dcache.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/dcache.c b/fs/dcache.c index 8b1f8425549f..ad25c4cec7d5 100644 --- a/fs/dcache.c +++ b/fs/dcache.c @@ -1612,10 +1612,13 @@ struct dentry *d_obtain_alias(struct inode *inode) __bit_spin_unlock(0, (unsigned long *)&tmp->d_sb->s_anon.first); spin_unlock(&tmp->d_lock); spin_unlock(&inode->i_lock); + security_d_instantiate(tmp, inode); return tmp; out_iput: + if (res && !IS_ERR(res)) + security_d_instantiate(res, inode); iput(inode); return res; } |