leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NFS: Use the dentry superblock directly in nfs_statfs()

Browse Source 
Use the nominated dentry's superblock directly in the NFS statfs() op to get a
file handle, rather than using s_root (which will become a dummy dentry in a
future patch).

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
David Howells 2006-08-22 20:06:10 -04:00 committed by Trond Myklebust
parent 24c8dbbb5f
commit 0c7d90cfed
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfs/super.c
View File

@ -240,11 +240,10 @@ void __exit unregister_nfs_fs(void)
*/ */
static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf) static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
{ {
struct super_block *sb = dentry->d_sb; struct nfs_server *server = NFS_SB(dentry->d_sb);
struct nfs_server *server = NFS_SB(sb);
unsigned char blockbits; unsigned char blockbits;
unsigned long blockres; unsigned long blockres;
struct nfs_fh *rootfh = NFS_FH(sb->s_root->d_inode); struct nfs_fh *fh = NFS_FH(dentry->d_inode);
struct nfs_fattr fattr; struct nfs_fattr fattr;
struct nfs_fsstat res = { struct nfs_fsstat res = {
.fattr = &fattr, .fattr = &fattr,
@ -253,7 +252,7 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
lock_kernel(); lock_kernel();
error = server->rpc_ops->statfs(server, rootfh, &res); error = server->rpc_ops->statfs(server, fh, &res);
buf->f_type = NFS_SUPER_MAGIC; buf->f_type = NFS_SUPER_MAGIC;
if (error < 0) if (error < 0)
goto out_err; goto out_err;
@ -263,7 +262,7 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
* case where f_frsize != f_bsize. Eventually we want to * case where f_frsize != f_bsize. Eventually we want to
* report the value of wtmult in this field. * report the value of wtmult in this field.
*/ */
buf->f_frsize = sb->s_blocksize; buf->f_frsize = dentry->d_sb->s_blocksize;
/* /*
* On most *nix systems, f_blocks, f_bfree, and f_bavail * On most *nix systems, f_blocks, f_bfree, and f_bavail
@ -272,8 +271,8 @@ static int nfs_statfs(struct dentry *dentry, struct kstatfs *buf)
* thus historically Linux's sys_statfs reports these * thus historically Linux's sys_statfs reports these
* fields in units of f_bsize. * fields in units of f_bsize.
*/ */
buf->f_bsize = sb->s_blocksize; buf->f_bsize = dentry->d_sb->s_blocksize;
blockbits = sb->s_blocksize_bits; blockbits = dentry->d_sb->s_blocksize_bits;
blockres = (1 << blockbits) - 1; blockres = (1 << blockbits) - 1;
buf->f_blocks = (res.tbytes + blockres) >> blockbits; buf->f_blocks = (res.tbytes + blockres) >> blockbits;
buf->f_bfree = (res.fbytes + blockres) >> blockbits; buf->f_bfree = (res.fbytes + blockres) >> blockbits;