Skip to content

Commit

Permalink
vfs: add helpers to get root and pwd
Browse files Browse the repository at this point in the history 
Add three helpers that retrieve a refcounted copy of the root and cwd
from the supplied fs_struct.

 get_fs_root()
 get_fs_pwd()
 get_fs_root_and_pwd()

Signed-off-by: Miklos Szeredi <[email protected]>
Signed-off-by: Al Viro <[email protected]>
  • Loading branch information
Miklos Szeredi authored and Al Viro committed Aug 11, 2010
1 parent 542ce7a commit f7ad3c6
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 62 deletions.
14 changes: 2 additions & 12 deletions fs/cachefiles/daemon.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -552,7 +552,6 @@ static int cachefiles_daemon_tag(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
{
struct fs_struct *fs;
struct path path;
const struct cred *saved_cred;
int ret;
Expand All @@ -573,11 +572,7 @@ static int cachefiles_daemon_cull(struct cachefiles_cache *cache, char *args)
}

/* extract the directory dentry from the cwd */
fs = current->fs;
read_lock(&fs->lock);
path = fs->pwd;
path_get(&path);
read_unlock(&fs->lock);
get_fs_pwd(current->fs, &path);

if (!S_ISDIR(path.dentry->d_inode->i_mode))
goto notdir;
Expand Down Expand Up @@ -629,7 +624,6 @@ static int cachefiles_daemon_debug(struct cachefiles_cache *cache, char *args)
*/
static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
{
struct fs_struct *fs;
struct path path;
const struct cred *saved_cred;
int ret;
Expand All @@ -650,11 +644,7 @@ static int cachefiles_daemon_inuse(struct cachefiles_cache *cache, char *args)
}

/* extract the directory dentry from the cwd */
fs = current->fs;
read_lock(&fs->lock);
path = fs->pwd;
path_get(&path);
read_unlock(&fs->lock);
get_fs_pwd(current->fs, &path);

if (!S_ISDIR(path.dentry->d_inode->i_mode))
goto notdir;
Expand Down
12 changes: 2 additions & 10 deletions fs/dcache.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2014,10 +2014,7 @@ char *d_path(const struct path *path, char *buf, int buflen)
if (path->dentry->d_op && path->dentry->d_op->d_dname)
return path->dentry->d_op->d_dname(path->dentry, buf, buflen);

read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&root);
read_unlock(&current->fs->lock);
get_fs_root(current->fs, &root);
spin_lock(&dcache_lock);
tmp = root;
res = __d_path(path, &tmp, buf, buflen);
Expand Down Expand Up @@ -2129,12 +2126,7 @@ SYSCALL_DEFINE2(getcwd, char __user *, buf, unsigned long, size)
if (!page)
return -ENOMEM;

read_lock(&current->fs->lock);
pwd = current->fs->pwd;
path_get(&pwd);
root = current->fs->root;
path_get(&root);
read_unlock(&current->fs->lock);
get_fs_root_and_pwd(current->fs, &root, &pwd);

error = -ENOENT;
spin_lock(&dcache_lock);
Expand Down
7 changes: 1 addition & 6 deletions fs/fs_struct.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
fs->in_exec = 0;
rwlock_init(&fs->lock);
fs->umask = old->umask;
read_lock(&old->lock);
fs->root = old->root;
path_get(&old->root);
fs->pwd = old->pwd;
path_get(&old->pwd);
read_unlock(&old->lock);
get_fs_root_and_pwd(old, &fs->root, &fs->pwd);
}
return fs;
}
Expand Down
15 changes: 3 additions & 12 deletions fs/namei.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,8 @@ static int exec_permission(struct inode *inode)

static __always_inline void set_root(struct nameidata *nd)
{
if (!nd->root.mnt) {
struct fs_struct *fs = current->fs;
read_lock(&fs->lock);
nd->root = fs->root;
path_get(&nd->root);
read_unlock(&fs->lock);
}
if (!nd->root.mnt)
get_fs_root(current->fs, &nd->root);
}

static int link_path_walk(const char *, struct nameidata *);
Expand Down Expand Up @@ -1015,11 +1010,7 @@ static int path_init(int dfd, const char *name, unsigned int flags, struct namei
nd->path = nd->root;
path_get(&nd->root);
} else if (dfd == AT_FDCWD) {
struct fs_struct *fs = current->fs;
read_lock(&fs->lock);
nd->path = fs->pwd;
path_get(&fs->pwd);
read_unlock(&fs->lock);
get_fs_pwd(current->fs, &nd->path);
} else {
struct dentry *dentry;

Expand Down
5 changes: 1 addition & 4 deletions fs/namespace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2213,10 +2213,7 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
goto out1;
}

read_lock(&current->fs->lock);
root = current->fs->root;
path_get(&current->fs->root);
read_unlock(&current->fs->lock);
get_fs_root(current->fs, &root);
down_write(&namespace_sem);
mutex_lock(&old.dentry->d_inode->i_mutex);
error = -EINVAL;
Expand Down
22 changes: 11 additions & 11 deletions fs/proc/base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,18 +149,13 @@ static unsigned int pid_entry_count_dirs(const struct pid_entry *entries,
return count;
}

static int get_fs_path(struct task_struct *task, struct path *path, bool root)
static int get_task_root(struct task_struct *task, struct path *root)
{
struct fs_struct *fs;
int result = -ENOENT;

task_lock(task);
fs = task->fs;
if (fs) {
read_lock(&fs->lock);
*path = root ? fs->root : fs->pwd;
path_get(path);
read_unlock(&fs->lock);
if (task->fs) {
get_fs_root(task->fs, root);
result = 0;
}
task_unlock(task);
Expand All @@ -173,7 +168,12 @@ static int proc_cwd_link(struct inode *inode, struct path *path)
int result = -ENOENT;

if (task) {
result = get_fs_path(task, path, 0);
task_lock(task);
if (task->fs) {
get_fs_pwd(task->fs, path);
result = 0;
}
task_unlock(task);
put_task_struct(task);
}
return result;
Expand All @@ -185,7 +185,7 @@ static int proc_root_link(struct inode *inode, struct path *path)
int result = -ENOENT;

if (task) {
result = get_fs_path(task, path, 1);
result = get_task_root(task, path);
put_task_struct(task);
}
return result;
Expand Down Expand Up @@ -597,7 +597,7 @@ static int mounts_open_common(struct inode *inode, struct file *file,
get_mnt_ns(ns);
}
rcu_read_unlock();
if (ns && get_fs_path(task, &root, 1) == 0)
if (ns && get_task_root(task, &root) == 0)
ret = 0;
put_task_struct(task);
}
Expand Down
27 changes: 27 additions & 0 deletions include/linux/fs_struct.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,31 @@ extern void free_fs_struct(struct fs_struct *);
extern void daemonize_fs_struct(void);
extern int unshare_fs_struct(void);

static inline void get_fs_root(struct fs_struct *fs, struct path *root)
{
read_lock(&fs->lock);
*root = fs->root;
path_get(root);
read_unlock(&fs->lock);
}

static inline void get_fs_pwd(struct fs_struct *fs, struct path *pwd)
{
read_lock(&fs->lock);
*pwd = fs->pwd;
path_get(pwd);
read_unlock(&fs->lock);
}

static inline void get_fs_root_and_pwd(struct fs_struct *fs, struct path *root,
struct path *pwd)
{
read_lock(&fs->lock);
*root = fs->root;
path_get(root);
*pwd = fs->pwd;
path_get(pwd);
read_unlock(&fs->lock);
}

#endif /* _LINUX_FS_STRUCT_H */
9 changes: 2 additions & 7 deletions kernel/auditsc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1835,13 +1835,8 @@ void __audit_getname(const char *name)
context->names[context->name_count].ino = (unsigned long)-1;
context->names[context->name_count].osid = 0;
++context->name_count;
if (!context->pwd.dentry) {
read_lock(&current->fs->lock);
context->pwd = current->fs->pwd;
path_get(&current->fs->pwd);
read_unlock(&current->fs->lock);
}

if (!context->pwd.dentry)
get_fs_pwd(current->fs, &context->pwd);
}

/* audit_putname - intercept a putname request
Expand Down

0 comments on commit f7ad3c6

Please sign in to comment.