UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Move the write verifier into the nfs_pgio_header 

The header had a pointer to the verifier that was set from the old write
data struct.  We don't need to keep the pointer around now that we have
shared structures.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Anna Schumaker 2014-05-06 09:12:28 -04:00 committed by Trond Myklebust
parent c0752cdfbb
commit f79d06f544
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/direct.c
View File

@ -813,12 +813,12 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr)
if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES) if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES)
bit = NFS_IOHDR_NEED_RESCHED; bit = NFS_IOHDR_NEED_RESCHED;
else if (dreq->flags == 0) { else if (dreq->flags == 0) {
memcpy(&dreq->verf, hdr->verf, memcpy(&dreq->verf, &hdr->verf,
sizeof(dreq->verf)); sizeof(dreq->verf));
bit = NFS_IOHDR_NEED_COMMIT; bit = NFS_IOHDR_NEED_COMMIT;
dreq->flags = NFS_ODIRECT_DO_COMMIT; dreq->flags = NFS_ODIRECT_DO_COMMIT;
} else if (dreq->flags == NFS_ODIRECT_DO_COMMIT) { } else if (dreq->flags == NFS_ODIRECT_DO_COMMIT) {
if (memcmp(&dreq->verf, hdr->verf, sizeof(dreq->verf))) { if (memcmp(&dreq->verf, &hdr->verf, sizeof(dreq->verf))) {
dreq->flags = NFS_ODIRECT_RESCHED_WRITES; dreq->flags = NFS_ODIRECT_RESCHED_WRITES;
bit = NFS_IOHDR_NEED_RESCHED; bit = NFS_IOHDR_NEED_RESCHED;
} else } else

7
fs/nfs/write.c
View File

@ -82,7 +82,6 @@ struct nfs_rw_header *nfs_writehdr_alloc(void)
INIT_LIST_HEAD(&hdr->rpc_list); INIT_LIST_HEAD(&hdr->rpc_list);
spin_lock_init(&hdr->lock); spin_lock_init(&hdr->lock);
atomic_set(&hdr->refcnt, 0); atomic_set(&hdr->refcnt, 0);
hdr->verf = &p->verf;
} }
return p; return p;
} }
@ -644,7 +643,7 @@ static void nfs_write_completion(struct nfs_pgio_header *hdr)
goto next; goto next;
} }
if (test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags)) { if (test_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags)) {
memcpy(&req->wb_verf, &hdr->verf->verifier, sizeof(req->wb_verf)); memcpy(&req->wb_verf, &hdr->verf.verifier, sizeof(req->wb_verf));
nfs_mark_request_commit(req, hdr->lseg, &cinfo); nfs_mark_request_commit(req, hdr->lseg, &cinfo);
goto next; goto next;
} }
@ -1344,8 +1343,8 @@ static void nfs_writeback_release_common(void *calldata)
if (test_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags)) if (test_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags))
; /* Do nothing */ ; /* Do nothing */
else if (!test_and_set_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags)) else if (!test_and_set_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags))
memcpy(hdr->verf, &data->verf, sizeof(*hdr->verf)); memcpy(&hdr->verf, &data->verf, sizeof(hdr->verf));
else if (memcmp(hdr->verf, &data->verf, sizeof(*hdr->verf))) else if (memcmp(&hdr->verf, &data->verf, sizeof(hdr->verf)))
set_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags); set_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags);
spin_unlock(&hdr->lock); spin_unlock(&hdr->lock);
} }

3
include/linux/nfs_xdr.h
View File

@ -1263,7 +1263,7 @@ struct nfs_pgio_header {
struct list_head rpc_list; struct list_head rpc_list;
atomic_t refcnt; atomic_t refcnt;
struct nfs_page *req; struct nfs_page *req;
struct nfs_writeverf *verf; struct nfs_writeverf verf; /* Used for writes */
struct pnfs_layout_segment *lseg; struct pnfs_layout_segment *lseg;
loff_t io_start; loff_t io_start;
const struct rpc_call_ops *mds_ops; const struct rpc_call_ops *mds_ops;
@ -1297,7 +1297,6 @@ struct nfs_pgio_data {
struct nfs_rw_header { struct nfs_rw_header {
struct nfs_pgio_header header; struct nfs_pgio_header header;
struct nfs_pgio_data rpc_data; struct nfs_pgio_data rpc_data;
struct nfs_writeverf verf;
}; };
struct nfs_mds_commit_info { struct nfs_mds_commit_info {