diff options
author | Christoph Hellwig <hch@infradead.org> | 2010-10-10 05:36:21 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-25 21:26:12 -0400 |
commit | be148247cfbe2422f5709e77d9c3e10b8a6394da (patch) | |
tree | f04605bb5ea21cefd455b6fd81c51d8bb02c1521 /security/tomoyo/realpath.c | |
parent | 85fe4025c616a7c0ed07bc2fc8c5371b07f3888c (diff) |
fs: take dcache_lock inside __d_path
All callers take dcache_lock just around the call to __d_path, so
take the lock into it in preparation of getting rid of dcache_lock.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/tomoyo/realpath.c')
-rw-r--r-- | security/tomoyo/realpath.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index ed8ccd680102..1d0bf8fa1922 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c | |||
@@ -127,10 +127,8 @@ char *tomoyo_realpath_from_path(struct path *path) | |||
127 | /* If we don't have a vfsmount, we can't calculate. */ | 127 | /* If we don't have a vfsmount, we can't calculate. */ |
128 | if (!path->mnt) | 128 | if (!path->mnt) |
129 | break; | 129 | break; |
130 | spin_lock(&dcache_lock); | ||
131 | /* go to whatever namespace root we are under */ | 130 | /* go to whatever namespace root we are under */ |
132 | pos = __d_path(path, &ns_root, buf, buf_len); | 131 | pos = __d_path(path, &ns_root, buf, buf_len); |
133 | spin_unlock(&dcache_lock); | ||
134 | /* Prepend "/proc" prefix if using internal proc vfs mount. */ | 132 | /* Prepend "/proc" prefix if using internal proc vfs mount. */ |
135 | if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && | 133 | if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && |
136 | (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { | 134 | (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { |