diff options
| author | Jan Blunck <jblunck@suse.de> | 2008-02-14 19:34:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-14 21:13:33 -0800 |
| commit | ac748a09fc873915254ed69fe83f1a95436ee30a (patch) | |
| tree | 1544b5d5d71e1d4902a1e1255ef8703260a0150e /fs/open.c | |
| parent | 6ac08c39a16f72c2d3e845cb6849a1392fa03e80 (diff) | |
| download | linux-3.10-ac748a09fc873915254ed69fe83f1a95436ee30a.tar.gz linux-3.10-ac748a09fc873915254ed69fe83f1a95436ee30a.tar.bz2 linux-3.10-ac748a09fc873915254ed69fe83f1a95436ee30a.zip | |
Make set_fs_{root,pwd} take a struct path
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>
Diffstat (limited to 'fs/open.c')
| -rw-r--r-- | fs/open.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/fs/open.c b/fs/open.c index ca8ac4bbd3b..54198538b67 100644 --- a/fs/open.c +++ b/fs/open.c @@ -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: |