[PATCH] add a vfs_permission helper

Most permission() calls have a struct nameidata * available.  This helper
takes that as an argument and thus makes sure we pass it down for lookup
intents and prepares for per-mount read-only support where we need a struct
vfsmount for checking whether a file is writeable.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Hellwig
2005-11-08 21:35:04 -08:00
committed by Linus Torvalds
parent e4a53cbabc
commit e4543eddfd
7 changed files with 31 additions and 15 deletions

View File

@ -240,7 +240,7 @@ static inline long do_sys_truncate(const char __user * path, loff_t length)
if (!S_ISREG(inode->i_mode))
goto dput_and_out;
error = permission(inode,MAY_WRITE,&nd);
error = vfs_permission(&nd, MAY_WRITE);
if (error)
goto dput_and_out;
@ -394,7 +394,7 @@ asmlinkage long sys_utime(char __user * filename, struct utimbuf __user * times)
goto dput_and_out;
if (current->fsuid != inode->i_uid &&
(error = permission(inode,MAY_WRITE,&nd)) != 0)
(error = vfs_permission(&nd, MAY_WRITE)) != 0)
goto dput_and_out;
}
down(&inode->i_sem);
@ -447,7 +447,7 @@ long do_utimes(char __user * filename, struct timeval * times)
goto dput_and_out;
if (current->fsuid != inode->i_uid &&
(error = permission(inode,MAY_WRITE,&nd)) != 0)
(error = vfs_permission(&nd, MAY_WRITE)) != 0)
goto dput_and_out;
}
down(&inode->i_sem);
@ -506,7 +506,7 @@ asmlinkage long sys_access(const char __user * filename, int mode)
res = __user_walk(filename, LOOKUP_FOLLOW|LOOKUP_ACCESS, &nd);
if (!res) {
res = permission(nd.dentry->d_inode, mode, &nd);
res = vfs_permission(&nd, mode);
/* SuS v2 requires we report a read only fs too */
if(!res && (mode & S_IWOTH) && IS_RDONLY(nd.dentry->d_inode)
&& !special_file(nd.dentry->d_inode->i_mode))
@ -530,7 +530,7 @@ asmlinkage long sys_chdir(const char __user * filename)
if (error)
goto out;
error = permission(nd.dentry->d_inode,MAY_EXEC,&nd);
error = vfs_permission(&nd, MAY_EXEC);
if (error)
goto dput_and_out;
@ -581,7 +581,7 @@ asmlinkage long sys_chroot(const char __user * filename)
if (error)
goto out;
error = permission(nd.dentry->d_inode,MAY_EXEC,&nd);
error = vfs_permission(&nd, MAY_EXEC);
if (error)
goto dput_and_out;