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 | |
| parent | 85fe4025c616a7c0ed07bc2fc8c5371b07f3888c (diff) | |
| download | linux-3.10-be148247cfbe2422f5709e77d9c3e10b8a6394da.tar.gz linux-3.10-be148247cfbe2422f5709e77d9c3e10b8a6394da.tar.bz2 linux-3.10-be148247cfbe2422f5709e77d9c3e10b8a6394da.zip | |
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')
| -rw-r--r-- | security/apparmor/path.c | 2 | ||||
| -rw-r--r-- | security/tomoyo/realpath.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c index 82396050f18..36cc0cc39e7 100644 --- a/security/apparmor/path.c +++ b/security/apparmor/path.c @@ -72,10 +72,8 @@ static int d_namespace_path(struct path *path, char *buf, int buflen, path_get(&root); } - spin_lock(&dcache_lock); tmp = root; res = __d_path(path, &tmp, buf, buflen); - spin_unlock(&dcache_lock); *name = res; /* handle error conditions - and still allow a partial path to diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index ed8ccd68010..1d0bf8fa192 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c @@ -127,10 +127,8 @@ char *tomoyo_realpath_from_path(struct path *path) /* If we don't have a vfsmount, we can't calculate. */ if (!path->mnt) break; - spin_lock(&dcache_lock); /* go to whatever namespace root we are under */ pos = __d_path(path, &ns_root, buf, buf_len); - spin_unlock(&dcache_lock); /* Prepend "/proc" prefix if using internal proc vfs mount. */ if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { |