mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move taking vfsmount_lock down into prepend_path()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2013-10-01 16:18:06 -04:00
parent 474279dc0f
commit 94e92a6e77
1 changed files with 2 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

11
fs/dcache.c
View file

@ -2889,6 +2889,7 @@ static int prepend_path(const struct path *path,
char *bptr; char *bptr;
int blen; int blen;
br_read_lock(&vfsmount_lock);
rcu_read_lock(); rcu_read_lock();
restart: restart:
bptr = *buffer; bptr = *buffer;
@ -2935,6 +2936,7 @@ static int prepend_path(const struct path *path,
goto restart; goto restart;
} }
done_seqretry(&rename_lock, seq); done_seqretry(&rename_lock, seq);
br_read_unlock(&vfsmount_lock);
if (error >= 0 && bptr == *buffer) { if (error >= 0 && bptr == *buffer) {
if (--blen < 0) if (--blen < 0)
@ -2971,9 +2973,7 @@ char *__d_path(const struct path *path,
int error; int error;
prepend(&res, &buflen, "\0", 1); prepend(&res, &buflen, "\0", 1);
br_read_lock(&vfsmount_lock);
error = prepend_path(path, root, &res, &buflen); error = prepend_path(path, root, &res, &buflen);
br_read_unlock(&vfsmount_lock);
if (error < 0) if (error < 0)
return ERR_PTR(error); return ERR_PTR(error);
@ -2990,9 +2990,7 @@ char *d_absolute_path(const struct path *path,
int error; int error;
prepend(&res, &buflen, "\0", 1); prepend(&res, &buflen, "\0", 1);
br_read_lock(&vfsmount_lock);
error = prepend_path(path, &root, &res, &buflen); error = prepend_path(path, &root, &res, &buflen);
br_read_unlock(&vfsmount_lock);
if (error > 1) if (error > 1)
error = -EINVAL; error = -EINVAL;
@ -3067,9 +3065,7 @@ char *d_path(const struct path *path, char *buf, int buflen)
rcu_read_lock(); rcu_read_lock();
get_fs_root_rcu(current->fs, &root); get_fs_root_rcu(current->fs, &root);
br_read_lock(&vfsmount_lock);
error = path_with_deleted(path, &root, &res, &buflen); error = path_with_deleted(path, &root, &res, &buflen);
br_read_unlock(&vfsmount_lock);
rcu_read_unlock(); rcu_read_unlock();
if (error < 0) if (error < 0)
@ -3224,7 +3220,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
get_fs_root_and_pwd_rcu(current->fs, &root, &pwd); get_fs_root_and_pwd_rcu(current->fs, &root, &pwd);
error = -ENOENT; error = -ENOENT;
br_read_lock(&vfsmount_lock);
if (!d_unlinked(pwd.dentry)) { if (!d_unlinked(pwd.dentry)) {
unsigned long len; unsigned long len;
char *cwd = page + PATH_MAX; char *cwd = page + PATH_MAX;
@ -3232,7 +3227,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
prepend(&cwd, &buflen, "\0", 1); prepend(&cwd, &buflen, "\0", 1);
error = prepend_path(&pwd, &root, &cwd, &buflen); error = prepend_path(&pwd, &root, &cwd, &buflen);
br_read_unlock(&vfsmount_lock);
rcu_read_unlock(); rcu_read_unlock();
if (error < 0) if (error < 0)
@ -3253,7 +3247,6 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
error = -EFAULT; error = -EFAULT;
} }
} else { } else {
br_read_unlock(&vfsmount_lock);
rcu_read_unlock(); rcu_read_unlock();
} }