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

Commit a841b54d authored by Trond Myklebust's avatar Trond Myklebust Committed by Trond Myklebust
Browse files

NFS: Pass the inode down to the getattr() callback 



Allow the getattr() callback to check things like whether or not we hold
a delegation so that it can adjust the attributes that it is asking for.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 30846df0

fs/nfs/client.c

+2 −1
Original line number Diff line number Diff line
@@ -969,7 +969,8 @@ struct nfs_server *nfs_create_server(struct nfs_mount_info *mount_info, 
	}



	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		error = nfs_mod->rpc_ops->getattr(server, mount_info->mntfh, fattr, NULL);

		error = nfs_mod->rpc_ops->getattr(server, mount_info->mntfh,

				fattr, NULL, NULL);

		if (error < 0) {

			dprintk("nfs_create_server: getattr error = %d\n", -error);

			goto error;

fs/nfs/dir.c

+2 −1
Original line number Diff line number Diff line
@@ -1656,7 +1656,8 @@ int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fhandle, 
	nfs_set_verifier(dentry, nfs_save_change_attribute(dir));

	if (!(fattr->valid & NFS_ATTR_FATTR)) {

		struct nfs_server *server = NFS_SB(dentry->d_sb);

		error = server->nfs_client->rpc_ops->getattr(server, fhandle, fattr, NULL);

		error = server->nfs_client->rpc_ops->getattr(server, fhandle,

				fattr, NULL, NULL);

		if (error < 0)

			goto out_error;

	}

fs/nfs/export.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ nfs_fh_to_dentry(struct super_block *sb, struct fid *fid, 
	}



	rpc_ops = NFS_SB(sb)->nfs_client->rpc_ops;

	ret = rpc_ops->getattr(NFS_SB(sb), server_fh, fattr, label);

	ret = rpc_ops->getattr(NFS_SB(sb), server_fh, fattr, label, NULL);

	if (ret) {

		dprintk("%s: getattr failed %d\n", __func__, ret);

		dentry = ERR_PTR(ret);

fs/nfs/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,8 @@ __nfs_revalidate_inode(struct nfs_server *server, struct inode *inode) 
		goto out;

	}



	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr, label);

	status = NFS_PROTO(inode)->getattr(server, NFS_FH(inode), fattr,

			label, inode);

	if (status != 0) {

		dfprintk(PAGECACHE, "nfs_revalidate_inode: (%s/%Lu) getattr failed, error=%d\n",

			 inode->i_sb->s_id,

fs/nfs/nfs3proc.c

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ nfs3_proc_get_root(struct nfs_server *server, struct nfs_fh *fhandle, 
 */

static int

nfs3_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle,

		struct nfs_fattr *fattr, struct nfs4_label *label)

		struct nfs_fattr *fattr, struct nfs4_label *label,

		struct inode *inode)

{

	struct rpc_message msg = {

		.rpc_proc	= &nfs3_procedures[NFS3PROC_GETATTR],