Skip to content

L
linux-davinci
Commit 911d1aaf authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: locking XDR cleanup 

 Get rid of some unnecessary intermediate structures
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 864472e9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 196 deletions
fs/nfs/nfs4proc.c
View file @ 911d1aaf
This diff is collapsed.
fs/nfs/nfs4xdr.c
View file @ 911d1aaf
...@@ -742,69 +742,80 @@ static int encode_link(struct xdr_stream *xdr, const struct qstr *name) ...@@ -742,69 +742,80 @@ static int encode_link(struct xdr_stream *xdr, const struct qstr *name)
return 0; return 0;
} }
static inline int nfs4_lock_type(struct file_lock *fl, int block)
{
if ((fl->fl_type & (F_RDLCK|F_WRLCK|F_UNLCK)) == F_RDLCK)
return block ? NFS4_READW_LT : NFS4_READ_LT;
return block ? NFS4_WRITEW_LT : NFS4_WRITE_LT;
}
static inline uint64_t nfs4_lock_length(struct file_lock *fl)
{
if (fl->fl_end == OFFSET_MAX)
return ~(uint64_t)0;
return fl->fl_end - fl->fl_start + 1;
}
/* /*
* opcode,type,reclaim,offset,length,new_lock_owner = 32 * opcode,type,reclaim,offset,length,new_lock_owner = 32
* open_seqid,open_stateid,lock_seqid,lock_owner.clientid, lock_owner.id = 40 * open_seqid,open_stateid,lock_seqid,lock_owner.clientid, lock_owner.id = 40
*/ */
static int encode_lock(struct xdr_stream *xdr, const struct nfs_lockargs *arg) static int encode_lock(struct xdr_stream *xdr, const struct nfs_lock_args *args)
{ {
uint32_t *p; uint32_t *p;
struct nfs_lock_opargs *opargs = arg->u.lock;
RESERVE_SPACE(32); RESERVE_SPACE(32);
WRITE32(OP_LOCK); WRITE32(OP_LOCK);
WRITE32(arg->type); WRITE32(nfs4_lock_type(args->fl, args->block));
WRITE32(opargs->reclaim); WRITE32(args->reclaim);
WRITE64(arg->offset); WRITE64(args->fl->fl_start);
WRITE64(arg->length); WRITE64(nfs4_lock_length(args->fl));
WRITE32(opargs->new_lock_owner); WRITE32(args->new_lock_owner);
if (opargs->new_lock_owner){ if (args->new_lock_owner){
RESERVE_SPACE(40); RESERVE_SPACE(40);
WRITE32(opargs->open_seqid->sequence->counter); WRITE32(args->open_seqid->sequence->counter);
WRITEMEM(opargs->open_stateid->data, sizeof(opargs->open_stateid->data)); WRITEMEM(args->open_stateid->data, sizeof(args->open_stateid->data));
WRITE32(opargs->lock_seqid->sequence->counter); WRITE32(args->lock_seqid->sequence->counter);
WRITE64(opargs->lock_owner.clientid); WRITE64(args->lock_owner.clientid);
WRITE32(4); WRITE32(4);
WRITE32(opargs->lock_owner.id); WRITE32(args->lock_owner.id);
} }
else { else {
RESERVE_SPACE(20); RESERVE_SPACE(20);
WRITEMEM(opargs->lock_stateid->data, sizeof(opargs->lock_stateid->data)); WRITEMEM(args->lock_stateid->data, sizeof(args->lock_stateid->data));
WRITE32(opargs->lock_seqid->sequence->counter); WRITE32(args->lock_seqid->sequence->counter);
} }
return 0; return 0;
} }
static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockargs *arg) static int encode_lockt(struct xdr_stream *xdr, const struct nfs_lockt_args *args)
{ {
uint32_t *p; uint32_t *p;
struct nfs_lowner *opargs = arg->u.lockt;
RESERVE_SPACE(40); RESERVE_SPACE(40);
WRITE32(OP_LOCKT); WRITE32(OP_LOCKT);
WRITE32(arg->type); WRITE32(nfs4_lock_type(args->fl, 0));
WRITE64(arg->offset); WRITE64(args->fl->fl_start);
WRITE64(arg->length); WRITE64(nfs4_lock_length(args->fl));
WRITE64(opargs->clientid); WRITE64(args->lock_owner.clientid);
WRITE32(4); WRITE32(4);
WRITE32(opargs->id); WRITE32(args->lock_owner.id);
return 0; return 0;
} }
static int encode_locku(struct xdr_stream *xdr, const struct nfs_lockargs *arg) static int encode_locku(struct xdr_stream *xdr, const struct nfs_locku_args *args)
{ {
uint32_t *p; uint32_t *p;
struct nfs_locku_opargs *opargs = arg->u.locku;
RESERVE_SPACE(44); RESERVE_SPACE(44);
WRITE32(OP_LOCKU); WRITE32(OP_LOCKU);
WRITE32(arg->type); WRITE32(nfs4_lock_type(args->fl, 0));
WRITE32(opargs->seqid->sequence->counter); WRITE32(args->seqid->sequence->counter);
WRITEMEM(opargs->stateid->data, sizeof(opargs->stateid->data)); WRITEMEM(args->stateid->data, sizeof(args->stateid->data));
WRITE64(arg->offset); WRITE64(args->fl->fl_start);
WRITE64(arg->length); WRITE64(nfs4_lock_length(args->fl));
return 0; return 0;
} }
...@@ -1596,21 +1607,20 @@ out: ...@@ -1596,21 +1607,20 @@ out:
/* /*
* Encode a LOCK request * Encode a LOCK request
*/ */
static int nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args) static int nfs4_xdr_enc_lock(struct rpc_rqst *req, uint32_t *p, struct nfs_lock_args *args)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr = { struct compound_hdr hdr = {
.nops = 2, .nops = 2,
}; };
struct nfs_lock_opargs *opargs = args->u.lock;
int status; int status;
status = nfs_wait_on_sequence(opargs->lock_seqid, req->rq_task); status = nfs_wait_on_sequence(args->lock_seqid, req->rq_task);
if (status != 0) if (status != 0)
goto out; goto out;
/* Do we need to do an open_to_lock_owner? */ /* Do we need to do an open_to_lock_owner? */
if (opargs->lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED) if (args->lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED)
opargs->new_lock_owner = 0; args->new_lock_owner = 0;
xdr_init_encode(&xdr, &req->rq_snd_buf, p); xdr_init_encode(&xdr, &req->rq_snd_buf, p);
encode_compound_hdr(&xdr, &hdr); encode_compound_hdr(&xdr, &hdr);
status = encode_putfh(&xdr, args->fh); status = encode_putfh(&xdr, args->fh);
...@@ -1624,7 +1634,7 @@ out: ...@@ -1624,7 +1634,7 @@ out:
/* /*
* Encode a LOCKT request * Encode a LOCKT request
*/ */
static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args) static int nfs4_xdr_enc_lockt(struct rpc_rqst *req, uint32_t *p, struct nfs_lockt_args *args)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr = { struct compound_hdr hdr = {
...@@ -1645,7 +1655,7 @@ out: ...@@ -1645,7 +1655,7 @@ out:
/* /*
* Encode a LOCKU request * Encode a LOCKU request
*/ */
static int nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_lockargs *args) static int nfs4_xdr_enc_locku(struct rpc_rqst *req, uint32_t *p, struct nfs_locku_args *args)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr = { struct compound_hdr hdr = {
...@@ -2949,55 +2959,64 @@ static int decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo) ...@@ -2949,55 +2959,64 @@ static int decode_link(struct xdr_stream *xdr, struct nfs4_change_info *cinfo)
/* /*
* We create the owner, so we know a proper owner.id length is 4. * We create the owner, so we know a proper owner.id length is 4.
*/ */
static int decode_lock_denied (struct xdr_stream *xdr, struct nfs_lock_denied *denied) static int decode_lock_denied (struct xdr_stream *xdr, struct file_lock *fl)
{ {
uint64_t offset, length, clientid;
uint32_t *p; uint32_t *p;
uint32_t namelen; uint32_t namelen, type;
READ_BUF(32); READ_BUF(32);
READ64(denied->offset); READ64(offset);
READ64(denied->length); READ64(length);
READ32(denied->type); READ32(type);
READ64(denied->owner.clientid); if (fl != NULL) {
fl->fl_start = (loff_t)offset;
fl->fl_end = fl->fl_start + (loff_t)length - 1;
if (length == ~(uint64_t)0)
fl->fl_end = OFFSET_MAX;
fl->fl_type = F_WRLCK;
if (type & 1)
fl->fl_type = F_RDLCK;
fl->fl_pid = 0;
}
READ64(clientid);
READ32(namelen); READ32(namelen);
READ_BUF(namelen); READ_BUF(namelen);
if (namelen == 4)
READ32(denied->owner.id);
return -NFS4ERR_DENIED; return -NFS4ERR_DENIED;
} }
static int decode_lock(struct xdr_stream *xdr, struct nfs_lockres *res) static int decode_lock(struct xdr_stream *xdr, struct nfs_lock_res *res)
{ {
uint32_t *p; uint32_t *p;
int status; int status;
status = decode_op_hdr(xdr, OP_LOCK); status = decode_op_hdr(xdr, OP_LOCK);
if (status == 0) { if (status == 0) {
READ_BUF(sizeof(res->u.stateid.data)); READ_BUF(sizeof(res->stateid.data));
COPYMEM(res->u.stateid.data, sizeof(res->u.stateid.data)); COPYMEM(res->stateid.data, sizeof(res->stateid.data));
} else if (status == -NFS4ERR_DENIED) } else if (status == -NFS4ERR_DENIED)
return decode_lock_denied(xdr, &res->u.denied); return decode_lock_denied(xdr, NULL);
return status; return status;
} }
static int decode_lockt(struct xdr_stream *xdr, struct nfs_lockres *res) static int decode_lockt(struct xdr_stream *xdr, struct nfs_lockt_res *res)
{ {
int status; int status;
status = decode_op_hdr(xdr, OP_LOCKT); status = decode_op_hdr(xdr, OP_LOCKT);
if (status == -NFS4ERR_DENIED) if (status == -NFS4ERR_DENIED)
return decode_lock_denied(xdr, &res->u.denied); return decode_lock_denied(xdr, res->denied);
return status; return status;
} }
static int decode_locku(struct xdr_stream *xdr, struct nfs_lockres *res) static int decode_locku(struct xdr_stream *xdr, struct nfs_locku_res *res)
{ {
uint32_t *p; uint32_t *p;
int status; int status;
status = decode_op_hdr(xdr, OP_LOCKU); status = decode_op_hdr(xdr, OP_LOCKU);
if (status == 0) { if (status == 0) {
READ_BUF(sizeof(res->u.stateid.data)); READ_BUF(sizeof(res->stateid.data));
COPYMEM(res->u.stateid.data, sizeof(res->u.stateid.data)); COPYMEM(res->stateid.data, sizeof(res->stateid.data));
} }
return status; return status;
} }
...@@ -3861,7 +3880,7 @@ out: ...@@ -3861,7 +3880,7 @@ out:
/* /*
* Decode LOCK response * Decode LOCK response
*/ */
static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockres *res) static int nfs4_xdr_dec_lock(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lock_res *res)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
...@@ -3882,7 +3901,7 @@ out: ...@@ -3882,7 +3901,7 @@ out:
/* /*
* Decode LOCKT response * Decode LOCKT response
*/ */
static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockres *res) static int nfs4_xdr_dec_lockt(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockt_res *res)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
...@@ -3903,7 +3922,7 @@ out: ...@@ -3903,7 +3922,7 @@ out:
/* /*
* Decode LOCKU response * Decode LOCKU response
*/ */
static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_lockres *res) static int nfs4_xdr_dec_locku(struct rpc_rqst *rqstp, uint32_t *p, struct nfs_locku_res *res)
{ {
struct xdr_stream xdr; struct xdr_stream xdr;
struct compound_hdr hdr; struct compound_hdr hdr;
......
include/linux/nfs_xdr.h
View file @ 911d1aaf
...@@ -165,50 +165,46 @@ struct nfs_closeres { ...@@ -165,50 +165,46 @@ struct nfs_closeres {
* * Arguments to the lock,lockt, and locku call. * * Arguments to the lock,lockt, and locku call.
* */ * */
struct nfs_lowner { struct nfs_lowner {
__u64 clientid; __u64 clientid;
u32 id; u32 id;
}; };
struct nfs_lock_opargs { struct nfs_lock_args {
struct nfs_fh * fh;
struct file_lock * fl;
struct nfs_seqid * lock_seqid; struct nfs_seqid * lock_seqid;
nfs4_stateid * lock_stateid; nfs4_stateid * lock_stateid;
struct nfs_seqid * open_seqid; struct nfs_seqid * open_seqid;
nfs4_stateid * open_stateid; nfs4_stateid * open_stateid;
struct nfs_lowner lock_owner; struct nfs_lowner lock_owner;
__u32 reclaim; unsigned char block : 1;
__u32 new_lock_owner; unsigned char reclaim : 1;
unsigned char new_lock_owner : 1;
};
struct nfs_lock_res {
nfs4_stateid stateid;
}; };
struct nfs_locku_opargs { struct nfs_locku_args {
struct nfs_fh * fh;
struct file_lock * fl;
struct nfs_seqid * seqid; struct nfs_seqid * seqid;
nfs4_stateid * stateid; nfs4_stateid * stateid;
}; };
struct nfs_lockargs { struct nfs_locku_res {
struct nfs_fh * fh; nfs4_stateid stateid;
__u32 type;
__u64 offset;
__u64 length;
union {
struct nfs_lock_opargs *lock; /* LOCK */
struct nfs_lowner *lockt; /* LOCKT */
struct nfs_locku_opargs *locku; /* LOCKU */
} u;
}; };
struct nfs_lock_denied { struct nfs_lockt_args {
__u64 offset; struct nfs_fh * fh;
__u64 length; struct file_lock * fl;
__u32 type; struct nfs_lowner lock_owner;
struct nfs_lowner owner;
}; };
struct nfs_lockres { struct nfs_lockt_res {
union { struct file_lock * denied; /* LOCK, LOCKT failed */
nfs4_stateid stateid;/* LOCK success, LOCKU */
struct nfs_lock_denied denied; /* LOCK failed, LOCKT success */
} u;
const struct nfs_server * server;
}; };
struct nfs4_delegreturnargs { struct nfs4_delegreturnargs {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment