mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
[PATCH] VFS: Permit filesystem to perform statfs with a known root dentry
Give the statfs superblock operation a dentry pointer rather than a superblock pointer. This complements the get_sb() patch. That reduced the significance of sb->s_root, allowing NFS to place a fake root there. However, NFS does require a dentry to use as a target for the statfs operation. This permits the root in the vfsmount to be used instead. linux/mount.h has been added where necessary to make allyesconfig build successfully. Interest has also been expressed for use with the FUSE and XFS filesystems. Signed-off-by: David Howells <[email protected]> Acked-by: Al Viro <[email protected]> Cc: Nathan Scott <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
454e2398be
commit
726c334223
60 changed files with 175 additions and 144 deletions
26
fs/open.c
26
fs/open.c
|
|
@ -31,18 +31,18 @@
|
|||
|
||||
#include <asm/unistd.h>
|
||||
|
||||
int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
|
||||
int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
|
||||
{
|
||||
int retval = -ENODEV;
|
||||
|
||||
if (sb) {
|
||||
if (dentry) {
|
||||
retval = -ENOSYS;
|
||||
if (sb->s_op->statfs) {
|
||||
if (dentry->d_sb->s_op->statfs) {
|
||||
memset(buf, 0, sizeof(*buf));
|
||||
retval = security_sb_statfs(sb);
|
||||
retval = security_sb_statfs(dentry);
|
||||
if (retval)
|
||||
return retval;
|
||||
retval = sb->s_op->statfs(sb, buf);
|
||||
retval = dentry->d_sb->s_op->statfs(dentry, buf);
|
||||
if (retval == 0 && buf->f_frsize == 0)
|
||||
buf->f_frsize = buf->f_bsize;
|
||||
}
|
||||
|
|
@ -52,12 +52,12 @@ int vfs_statfs(struct super_block *sb, struct kstatfs *buf)
|
|||
|
||||
EXPORT_SYMBOL(vfs_statfs);
|
||||
|
||||
static int vfs_statfs_native(struct super_block *sb, struct statfs *buf)
|
||||
static int vfs_statfs_native(struct dentry *dentry, struct statfs *buf)
|
||||
{
|
||||
struct kstatfs st;
|
||||
int retval;
|
||||
|
||||
retval = vfs_statfs(sb, &st);
|
||||
retval = vfs_statfs(dentry, &st);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
|
|
@ -95,12 +95,12 @@ static int vfs_statfs_native(struct super_block *sb, struct statfs *buf)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int vfs_statfs64(struct super_block *sb, struct statfs64 *buf)
|
||||
static int vfs_statfs64(struct dentry *dentry, struct statfs64 *buf)
|
||||
{
|
||||
struct kstatfs st;
|
||||
int retval;
|
||||
|
||||
retval = vfs_statfs(sb, &st);
|
||||
retval = vfs_statfs(dentry, &st);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ asmlinkage long sys_statfs(const char __user * path, struct statfs __user * buf)
|
|||
error = user_path_walk(path, &nd);
|
||||
if (!error) {
|
||||
struct statfs tmp;
|
||||
error = vfs_statfs_native(nd.dentry->d_inode->i_sb, &tmp);
|
||||
error = vfs_statfs_native(nd.dentry, &tmp);
|
||||
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
|
||||
error = -EFAULT;
|
||||
path_release(&nd);
|
||||
|
|
@ -149,7 +149,7 @@ asmlinkage long sys_statfs64(const char __user *path, size_t sz, struct statfs64
|
|||
error = user_path_walk(path, &nd);
|
||||
if (!error) {
|
||||
struct statfs64 tmp;
|
||||
error = vfs_statfs64(nd.dentry->d_inode->i_sb, &tmp);
|
||||
error = vfs_statfs64(nd.dentry, &tmp);
|
||||
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
|
||||
error = -EFAULT;
|
||||
path_release(&nd);
|
||||
|
|
@ -168,7 +168,7 @@ asmlinkage long sys_fstatfs(unsigned int fd, struct statfs __user * buf)
|
|||
file = fget(fd);
|
||||
if (!file)
|
||||
goto out;
|
||||
error = vfs_statfs_native(file->f_dentry->d_inode->i_sb, &tmp);
|
||||
error = vfs_statfs_native(file->f_dentry, &tmp);
|
||||
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
|
||||
error = -EFAULT;
|
||||
fput(file);
|
||||
|
|
@ -189,7 +189,7 @@ asmlinkage long sys_fstatfs64(unsigned int fd, size_t sz, struct statfs64 __user
|
|||
file = fget(fd);
|
||||
if (!file)
|
||||
goto out;
|
||||
error = vfs_statfs64(file->f_dentry->d_inode->i_sb, &tmp);
|
||||
error = vfs_statfs64(file->f_dentry, &tmp);
|
||||
if (!error && copy_to_user(buf, &tmp, sizeof(tmp)))
|
||||
error = -EFAULT;
|
||||
fput(file);
|
||||
|
|
|
|||
Loading…
Reference in a new issue