renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-14 16:23:51 +08:00
Code

NFSv4: don't put ACCESS in OPEN compound if O_EXCL

Browse Source 
Don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS
will return permission denied for all bits until close.

Fixes a regression due to commit 6168f62c (NFSv4: Add ACCESS operation to
OPEN compound)

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Weston Andros Adamson 2012-10-02 14:49:52 -07:00 committed by Trond Myklebust
parent bbd3a8eee8
commit ae2bb03236
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/nfs/nfs4proc.c
View File

@ -862,9 +862,15 @@ static struct nfs4_opendata *nfs4_opendata_alloc(struct dentry *dentry,
p->o_arg.fh = NFS_FH(dir); p->o_arg.fh = NFS_FH(dir);
p->o_arg.open_flags = flags; p->o_arg.open_flags = flags;
p->o_arg.fmode = fmode & (FMODE_READ|FMODE_WRITE); p->o_arg.fmode = fmode & (FMODE_READ|FMODE_WRITE);
/* ask server to check for all possible rights as results are cached */ /* don't put an ACCESS op in OPEN compound if O_EXCL, because ACCESS
p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY | * will return permission denied for all bits until close */
NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE; if (!(flags & O_EXCL)) {
/* ask server to check for all possible rights as results
* are cached */
p->o_arg.access = NFS4_ACCESS_READ | NFS4_ACCESS_MODIFY |
NFS4_ACCESS_EXTEND | NFS4_ACCESS_EXECUTE;
p->o_res.access_request = p->o_arg.access;
}
p->o_arg.clientid = server->nfs_client->cl_clientid; p->o_arg.clientid = server->nfs_client->cl_clientid;
p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time); p->o_arg.id.create_time = ktime_to_ns(sp->so_seqid.create_time);
p->o_arg.id.uniquifier = sp->so_seqid.owner_id; p->o_arg.id.uniquifier = sp->so_seqid.owner_id;

12
fs/nfs/nfs4xdr.c
View File

@ -2224,7 +2224,8 @@ static void nfs4_xdr_enc_open(struct rpc_rqst *req, struct xdr_stream *xdr,
encode_putfh(xdr, args->fh, &hdr); encode_putfh(xdr, args->fh, &hdr);
encode_open(xdr, args, &hdr); encode_open(xdr, args, &hdr);
encode_getfh(xdr, &hdr); encode_getfh(xdr, &hdr);
encode_access(xdr, args->access, &hdr); if (args->access)
encode_access(xdr, args->access, &hdr);
encode_getfattr_open(xdr, args->bitmask, args->open_bitmap, &hdr); encode_getfattr_open(xdr, args->bitmask, args->open_bitmap, &hdr);
encode_nops(&hdr); encode_nops(&hdr);
} }
@ -2261,7 +2262,8 @@ static void nfs4_xdr_enc_open_noattr(struct rpc_rqst *req,
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_open(xdr, args, &hdr); encode_open(xdr, args, &hdr);
encode_access(xdr, args->access, &hdr); if (args->access)
encode_access(xdr, args->access, &hdr);
encode_getfattr(xdr, args->bitmask, &hdr); encode_getfattr(xdr, args->bitmask, &hdr);
encode_nops(&hdr); encode_nops(&hdr);
} }
@ -6239,7 +6241,8 @@ static int nfs4_xdr_dec_open(struct rpc_rqst *rqstp, struct xdr_stream *xdr,
status = decode_getfh(xdr, &res->fh); status = decode_getfh(xdr, &res->fh);
if (status) if (status)
goto out; goto out;
decode_access(xdr, &res->access_supported, &res->access_result); if (res->access_request)
decode_access(xdr, &res->access_supported, &res->access_result);
decode_getfattr(xdr, res->f_attr, res->server); decode_getfattr(xdr, res->f_attr, res->server);
out: out:
return status; return status;
@ -6288,7 +6291,8 @@ static int nfs4_xdr_dec_open_noattr(struct rpc_rqst *rqstp,
status = decode_open(xdr, res); status = decode_open(xdr, res);
if (status) if (status)
goto out; goto out;
decode_access(xdr, &res->access_supported, &res->access_result); if (res->access_request)
decode_access(xdr, &res->access_supported, &res->access_result);
decode_getfattr(xdr, res->f_attr, res->server); decode_getfattr(xdr, res->f_attr, res->server);
out: out:
return status; return status;

1
include/linux/nfs_xdr.h
View File

@ -369,6 +369,7 @@ struct nfs_openres {
struct nfs4_string *owner; struct nfs4_string *owner;
struct nfs4_string *group_owner; struct nfs4_string *group_owner;
struct nfs4_sequence_res seq_res; struct nfs4_sequence_res seq_res;
__u32 access_request;
__u32 access_supported; __u32 access_supported;
__u32 access_result; __u32 access_result;
}; };