Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fs: take dcache_lock inside __d_path

Browse source 
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>
This commit is contained in:
Christoph Hellwig 2010-10-10 05:36:21 -04:00 committed by Al Viro
parent 85fe4025c6
commit be148247cf
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs/dcache.c
View file

@ -1994,7 +1994,7 @@ static int prepend_path(const struct path *path, struct path *root,
* Returns a pointer into the buffer or an error code if the * Returns a pointer into the buffer or an error code if the
* path was too long. * path was too long.
* *
* "buflen" should be positive. Caller holds the dcache_lock. * "buflen" should be positive.
* *
* If path is not reachable from the supplied root, then the value of * If path is not reachable from the supplied root, then the value of
* root is changed (without modifying refcounts). * root is changed (without modifying refcounts).
@ -2006,10 +2006,12 @@ char *__d_path(const struct path *path, struct path *root,
int error; int error;
prepend(&res, &buflen, "\0", 1); prepend(&res, &buflen, "\0", 1);
spin_lock(&dcache_lock);
error = prepend_path(path, root, &res, &buflen); error = prepend_path(path, root, &res, &buflen);
spin_unlock(&dcache_lock);
if (error) if (error)
return ERR_PTR(error); return ERR_PTR(error);
return res; return res;
} }

2
fs/seq_file.c
View file

@ -462,9 +462,7 @@ int seq_path_root(struct seq_file *m, struct path *path, struct path *root,
if (size) { if (size) {
char *p; char *p;
spin_lock(&dcache_lock);
p = __d_path(path, root, buf, size); p = __d_path(path, root, buf, size);
spin_unlock(&dcache_lock);
res = PTR_ERR(p); res = PTR_ERR(p);
if (!IS_ERR(p)) { if (!IS_ERR(p)) {
char *end = mangle_path(buf, p, esc); char *end = mangle_path(buf, p, esc);

2
security/apparmor/path.c
View file

@ -72,10 +72,8 @@ static int d_namespace_path(struct path *path, char *buf, int buflen,
path_get(&root); path_get(&root);
} }
spin_lock(&dcache_lock);
tmp = root; tmp = root;
res = __d_path(path, &tmp, buf, buflen); res = __d_path(path, &tmp, buf, buflen);
spin_unlock(&dcache_lock);
*name = res; *name = res;
/* handle error conditions - and still allow a partial path to /* handle error conditions - and still allow a partial path to

2
security/tomoyo/realpath.c
View file

@ -127,10 +127,8 @@ char *tomoyo_realpath_from_path(struct path *path)
/* If we don't have a vfsmount, we can't calculate. */ /* If we don't have a vfsmount, we can't calculate. */
if (!path->mnt) if (!path->mnt)
break; break;
spin_lock(&dcache_lock);
/* go to whatever namespace root we are under */ /* go to whatever namespace root we are under */
pos = __d_path(path, &ns_root, buf, buf_len); pos = __d_path(path, &ns_root, buf, buf_len);
spin_unlock(&dcache_lock);
/* Prepend "/proc" prefix if using internal proc vfs mount. */ /* Prepend "/proc" prefix if using internal proc vfs mount. */
if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) && if (!IS_ERR(pos) && (path->mnt->mnt_flags & MNT_INTERNAL) &&
(path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) { (path->mnt->mnt_sb->s_magic == PROC_SUPER_MAGIC)) {