Commit 1f163415 authored by David Howells's avatar David Howells Committed by Trond Myklebust
Browse files

NFS: Make better use of inode* dereferencing macros 



Make better use of inode* dereferencing macros to hide dereferencing chains
(including NFS_PROTO and NFS_CLIENT).

Signed-Off-By: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 27951bd2

fs/nfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ nfs_file_open(struct inode *inode, struct file *filp) 


	nfs_inc_stats(inode, NFSIOS_VFSOPEN);

	lock_kernel();

	res = NFS_SERVER(inode)->rpc_ops->file_open(inode, filp);

	res = NFS_PROTO(inode)->file_open(inode, filp);

	unlock_kernel();

	return res;

}

fs/nfs/nfs4proc.c

+5 −5
Original line number Diff line number Diff line
@@ -1268,7 +1268,7 @@ nfs4_atomic_open(struct inode *dir, struct dentry *dentry, struct nameidata *nd) 
		BUG_ON(nd->intent.open.flags & O_CREAT);

	}



	cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);

	cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);

	if (IS_ERR(cred))

		return (struct dentry *)cred;

	state = nfs4_do_open(dir, dentry, nd->intent.open.flags, &attr, cred);
@@ -1291,7 +1291,7 @@ nfs4_open_revalidate(struct inode *dir, struct dentry *dentry, int openflags, st 
	struct rpc_cred *cred;

	struct nfs4_state *state;



	cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);

	cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);

	if (IS_ERR(cred))

		return PTR_ERR(cred);

	state = nfs4_open_delegated(dentry->d_inode, openflags, cred);
@@ -1565,7 +1565,7 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, 


	nfs_fattr_init(fattr);

	

	cred = rpcauth_lookupcred(NFS_SERVER(inode)->client->cl_auth, 0);

	cred = rpcauth_lookupcred(NFS_CLIENT(inode)->cl_auth, 0);

	if (IS_ERR(cred))

		return PTR_ERR(cred);
@@ -1927,7 +1927,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, 
	struct rpc_cred *cred;

	int status = 0;



	cred = rpcauth_lookupcred(NFS_SERVER(dir)->client->cl_auth, 0);

	cred = rpcauth_lookupcred(NFS_CLIENT(dir)->cl_auth, 0);

	if (IS_ERR(cred)) {

		status = PTR_ERR(cred);

		goto out;
@@ -2816,7 +2816,7 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl 
		return -EOPNOTSUPP;

	nfs_inode_return_delegation(inode);

	buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);

	ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);

	ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);

	if (ret == 0)

		nfs4_write_cached_acl(inode, buf, buflen);

	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE