openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFSv4: Don't ask for attributes when ACCESS is protected by a delegation 

If we hold a delegation, then the results of the ACCESS call are protected
anyway.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2018-03-20 17:03:11 -04:00 committed by Anna Schumaker
parent 36b3743fef
commit 8bcbe7d98c
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfs/nfs4proc.c
View File

@ -4055,7 +4055,6 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
struct nfs_server *server = NFS_SERVER(inode); struct nfs_server *server = NFS_SERVER(inode);
struct nfs4_accessargs args = { struct nfs4_accessargs args = {
.fh = NFS_FH(inode), .fh = NFS_FH(inode),
.bitmask = server->cache_consistency_bitmask,
.access = entry->mask, .access = entry->mask,
}; };
struct nfs4_accessres res = { struct nfs4_accessres res = {
@ -4069,14 +4068,18 @@ static int _nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry
}; };
int status = 0; int status = 0;
res.fattr = nfs_alloc_fattr(); if (!nfs_have_delegated_attributes(inode)) {
if (res.fattr == NULL) res.fattr = nfs_alloc_fattr();
return -ENOMEM; if (res.fattr == NULL)
return -ENOMEM;
args.bitmask = server->cache_consistency_bitmask;
}
status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0); status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0);
if (!status) { if (!status) {
nfs_access_set_mask(entry, res.access); nfs_access_set_mask(entry, res.access);
nfs_refresh_inode(inode, res.fattr); if (res.fattr)
nfs_refresh_inode(inode, res.fattr);
} }
nfs_free_fattr(res.fattr); nfs_free_fattr(res.fattr);
return status; return status;

6
fs/nfs/nfs4xdr.c
View File

@ -2102,7 +2102,8 @@ static void nfs4_xdr_enc_access(struct rpc_rqst *req, struct xdr_stream *xdr,
encode_sequence(xdr, &args->seq_args, &hdr); encode_sequence(xdr, &args->seq_args, &hdr);
encode_putfh(xdr, args->fh, &hdr); encode_putfh(xdr, args->fh, &hdr);
encode_access(xdr, args->access, &hdr); encode_access(xdr, args->access, &hdr);
encode_getfattr(xdr, args->bitmask, &hdr); if (args->bitmask)
encode_getfattr(xdr, args->bitmask, &hdr);
encode_nops(&hdr); encode_nops(&hdr);
} }
@ -6236,7 +6237,8 @@ static int nfs4_xdr_dec_access(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
status = decode_access(xdr, &res->supported, &res->access); status = decode_access(xdr, &res->supported, &res->access);
if (status != 0) if (status != 0)
goto out; goto out;
decode_getfattr(xdr, res->fattr, res->server); if (res->fattr)
decode_getfattr(xdr, res->fattr, res->server);
out: out:
return status; return status;
} }