lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make set_fs_{root,pwd} take a struct path

Browse Source 
In nearly all cases the set_fs_{root,pwd}() calls work on a struct
path. Change the function to reflect this and use path_get() here.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jan Blunck
2008-02-14 19:34:39 -08:00
committed by Linus Torvalds
parent 6ac08c39a1
commit ac748a09fc
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
fs/open.c
View File

@@ -490,7 +490,7 @@ asmlinkage long sys_chdir(const char __user * filename)
if (error)
goto dput_and_out;
set_fs_pwd(current->fs, nd.path.mnt, nd.path.dentry);
set_fs_pwd(current->fs, &nd.path);
dput_and_out:
path_put(&nd.path);
@@ -501,9 +501,7 @@ out:
asmlinkage long sys_fchdir(unsigned int fd)
{
struct file *file;
struct dentry *dentry;
struct inode *inode;
struct vfsmount *mnt;
int error;
error = -EBADF;
@@ -511,9 +509,7 @@ asmlinkage long sys_fchdir(unsigned int fd)
if (!file)
goto out;
dentry = file->f_path.dentry;
mnt = file->f_path.mnt;
inode = dentry->d_inode;
inode = file->f_path.dentry->d_inode;
error = -ENOTDIR;
if (!S_ISDIR(inode->i_mode))
@@ -521,7 +517,7 @@ asmlinkage long sys_fchdir(unsigned int fd)
error = file_permission(file, MAY_EXEC);
if (!error)
set_fs_pwd(current->fs, mnt, dentry);
set_fs_pwd(current->fs, &file->f_path);
out_putf:
fput(file);
out:
@@ -545,7 +541,7 @@ asmlinkage long sys_chroot(const char __user * filename)
if (!capable(CAP_SYS_CHROOT))
goto dput_and_out;
set_fs_root(current->fs, nd.path.mnt, nd.path.dentry);
set_fs_root(current->fs, &nd.path);
set_fs_altroot();
error = 0;
dput_and_out: