NFS: Cleanup - only store the write verifier in struct nfs_page
The 'committed' field is not needed once we have put the struct nfs_page on the right list. Also correct the type of the verifier: it is not an array of __be32, but simply an 8 byte long opaque array. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
98d9452448
commit
2f2c63bc22
6 changed files with 26 additions and 16 deletions
|
@ -325,14 +325,14 @@ static void encode_createverf3(struct xdr_stream *xdr, const __be32 *verifier)
|
|||
memcpy(p, verifier, NFS3_CREATEVERFSIZE);
|
||||
}
|
||||
|
||||
static int decode_writeverf3(struct xdr_stream *xdr, __be32 *verifier)
|
||||
static int decode_writeverf3(struct xdr_stream *xdr, struct nfs_write_verifier *verifier)
|
||||
{
|
||||
__be32 *p;
|
||||
|
||||
p = xdr_inline_decode(xdr, NFS3_WRITEVERFSIZE);
|
||||
if (unlikely(p == NULL))
|
||||
goto out_overflow;
|
||||
memcpy(verifier, p, NFS3_WRITEVERFSIZE);
|
||||
memcpy(verifier->data, p, NFS3_WRITEVERFSIZE);
|
||||
return 0;
|
||||
out_overflow:
|
||||
print_overflow_msg(__func__, xdr);
|
||||
|
@ -1668,20 +1668,22 @@ static int decode_write3resok(struct xdr_stream *xdr,
|
|||
{
|
||||
__be32 *p;
|
||||
|
||||
p = xdr_inline_decode(xdr, 4 + 4 + NFS3_WRITEVERFSIZE);
|
||||
p = xdr_inline_decode(xdr, 4 + 4);
|
||||
if (unlikely(p == NULL))
|
||||
goto out_overflow;
|
||||
result->count = be32_to_cpup(p++);
|
||||
result->verf->committed = be32_to_cpup(p++);
|
||||
if (unlikely(result->verf->committed > NFS_FILE_SYNC))
|
||||
goto out_badvalue;
|
||||
memcpy(result->verf->verifier, p, NFS3_WRITEVERFSIZE);
|
||||
if (decode_writeverf3(xdr, &result->verf->verifier))
|
||||
goto out_eio;
|
||||
return result->count;
|
||||
out_badvalue:
|
||||
dprintk("NFS: bad stable_how value: %u\n", result->verf->committed);
|
||||
return -EIO;
|
||||
out_overflow:
|
||||
print_overflow_msg(__func__, xdr);
|
||||
out_eio:
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@ -2314,7 +2316,7 @@ static int nfs3_xdr_dec_commit3res(struct rpc_rqst *req,
|
|||
goto out;
|
||||
if (status != NFS3_OK)
|
||||
goto out_status;
|
||||
error = decode_writeverf3(xdr, result->verf->verifier);
|
||||
error = decode_writeverf3(xdr, &result->verf->verifier);
|
||||
out:
|
||||
return error;
|
||||
out_status:
|
||||
|
|
|
@ -351,9 +351,9 @@ static void prepare_to_resend_writes(struct nfs_commit_data *data)
|
|||
struct nfs_page *first = nfs_list_entry(data->pages.next);
|
||||
|
||||
data->task.tk_status = 0;
|
||||
memcpy(data->verf.verifier, first->wb_verf.verifier,
|
||||
sizeof(first->wb_verf.verifier));
|
||||
data->verf.verifier[0]++; /* ensure verifier mismatch */
|
||||
memcpy(&data->verf.verifier, &first->wb_verf,
|
||||
sizeof(data->verf.verifier));
|
||||
data->verf.verifier.data[0]++; /* ensure verifier mismatch */
|
||||
}
|
||||
|
||||
static int filelayout_commit_done_cb(struct rpc_task *task,
|
||||
|
|
|
@ -4158,13 +4158,18 @@ static int decode_verifier(struct xdr_stream *xdr, void *verifier)
|
|||
return decode_opaque_fixed(xdr, verifier, NFS4_VERIFIER_SIZE);
|
||||
}
|
||||
|
||||
static int decode_write_verifier(struct xdr_stream *xdr, struct nfs_write_verifier *verifier)
|
||||
{
|
||||
return decode_opaque_fixed(xdr, verifier->data, NFS4_VERIFIER_SIZE);
|
||||
}
|
||||
|
||||
static int decode_commit(struct xdr_stream *xdr, struct nfs_commitres *res)
|
||||
{
|
||||
int status;
|
||||
|
||||
status = decode_op_hdr(xdr, OP_COMMIT);
|
||||
if (!status)
|
||||
status = decode_verifier(xdr, res->verf->verifier);
|
||||
status = decode_write_verifier(xdr, &res->verf->verifier);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
@ -5192,13 +5197,12 @@ static int decode_write(struct xdr_stream *xdr, struct nfs_writeres *res)
|
|||
if (status)
|
||||
return status;
|
||||
|
||||
p = xdr_inline_decode(xdr, 16);
|
||||
p = xdr_inline_decode(xdr, 8);
|
||||
if (unlikely(!p))
|
||||
goto out_overflow;
|
||||
res->count = be32_to_cpup(p++);
|
||||
res->verf->committed = be32_to_cpup(p++);
|
||||
memcpy(res->verf->verifier, p, NFS4_VERIFIER_SIZE);
|
||||
return 0;
|
||||
return decode_write_verifier(xdr, &res->verf->verifier);
|
||||
out_overflow:
|
||||
print_overflow_msg(__func__, xdr);
|
||||
return -EIO;
|
||||
|
|
|
@ -620,7 +620,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
|
|||
goto next;
|
||||
}
|
||||
if (test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags)) {
|
||||
memcpy(&req->wb_verf, hdr->verf, sizeof(req->wb_verf));
|
||||
memcpy(&req->wb_verf, &hdr->verf->verifier, sizeof(req->wb_verf));
|
||||
nfs_mark_request_commit(req, hdr->lseg, &cinfo);
|
||||
goto next;
|
||||
}
|
||||
|
@ -1547,7 +1547,7 @@ static void nfs_commit_release_pages(struct nfs_commit_data *data)
|
|||
|
||||
/* Okay, COMMIT succeeded, apparently. Check the verifier
|
||||
* returned by the server against all stored verfs. */
|
||||
if (!memcmp(req->wb_verf.verifier, data->verf.verifier, sizeof(data->verf.verifier))) {
|
||||
if (!memcmp(&req->wb_verf, &data->verf.verifier, sizeof(req->wb_verf))) {
|
||||
/* We have a match */
|
||||
nfs_inode_remove_request(req);
|
||||
dprintk(" OK\n");
|
||||
|
|
|
@ -42,7 +42,7 @@ struct nfs_page {
|
|||
wb_bytes; /* Length of request */
|
||||
struct kref wb_kref; /* reference count */
|
||||
unsigned long wb_flags;
|
||||
struct nfs_writeverf wb_verf; /* Commit cookie */
|
||||
struct nfs_write_verifier wb_verf; /* Commit cookie */
|
||||
};
|
||||
|
||||
struct nfs_pageio_descriptor;
|
||||
|
|
|
@ -514,9 +514,13 @@ struct nfs_writeargs {
|
|||
struct nfs4_sequence_args seq_args;
|
||||
};
|
||||
|
||||
struct nfs_write_verifier {
|
||||
char data[8];
|
||||
};
|
||||
|
||||
struct nfs_writeverf {
|
||||
struct nfs_write_verifier verifier;
|
||||
enum nfs3_stable_how committed;
|
||||
__be32 verifier[2];
|
||||
};
|
||||
|
||||
struct nfs_writeres {
|
||||
|
|
Loading…
Reference in a new issue