Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1211908 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Eric Van Hensbergen
Browse files

fs/9p: Don't set stat.st_blocks based on nrpages 



simple_getattr does set stat.st_blocks to a value
derived from nrpages. That is not correct with 9p

Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri <jvrao@linux.vnet.ibm.com>
Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
parent 5ffc0cb3

fs/9p/vfs_inode.c

+4 −3
Original line number Diff line number Diff line
@@ -891,9 +891,10 @@ v9fs_vfs_getattr(struct vfsmount *mnt, struct dentry *dentry, 
	P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);

	err = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)

		return simple_getattr(mnt, dentry, stat);



	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {

		generic_fillattr(dentry->d_inode, stat);

		return 0;

	}

	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid))

		return PTR_ERR(fid);

fs/9p/vfs_inode_dotl.c

+4 −3
Original line number Diff line number Diff line
@@ -387,9 +387,10 @@ v9fs_vfs_getattr_dotl(struct vfsmount *mnt, struct dentry *dentry, 
	P9_DPRINTK(P9_DEBUG_VFS, "dentry: %p\n", dentry);

	err = -EPERM;

	v9ses = v9fs_inode2v9ses(dentry->d_inode);

	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)

		return simple_getattr(mnt, dentry, stat);



	if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE) {

		generic_fillattr(dentry->d_inode, stat);

		return 0;

	}

	fid = v9fs_fid_lookup(dentry);

	if (IS_ERR(fid))

		return PTR_ERR(fid);