Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f79d06f5 authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent c0752cdf

fs/nfs/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -813,12 +813,12 @@ static void nfs_direct_write_completion(struct nfs_pgio_header *hdr) 
			if (dreq->flags == NFS_ODIRECT_RESCHED_WRITES)

				bit = NFS_IOHDR_NEED_RESCHED;

			else if (dreq->flags == 0) {

				memcpy(&dreq->verf, hdr->verf,

				memcpy(&dreq->verf, &hdr->verf,

				       sizeof(dreq->verf));

				bit = NFS_IOHDR_NEED_COMMIT;

				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;

					bit = NFS_IOHDR_NEED_RESCHED;

				} else

fs/nfs/write.c

+3 −4
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ struct nfs_rw_header *nfs_writehdr_alloc(void) 
		INIT_LIST_HEAD(&hdr->rpc_list);

		spin_lock_init(&hdr->lock);

		atomic_set(&hdr->refcnt, 0);

		hdr->verf = &p->verf;

	}

	return p;

}
@@ -644,7 +643,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->verifier, 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;

		}
@@ -1344,8 +1343,8 @@ static void nfs_writeback_release_common(void *calldata) 
		if (test_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags))

			; /* Do nothing */

		else if (!test_and_set_bit(NFS_IOHDR_NEED_COMMIT, &hdr->flags))

			memcpy(hdr->verf, &data->verf, sizeof(*hdr->verf));

		else if (memcmp(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)))

			set_bit(NFS_IOHDR_NEED_RESCHED, &hdr->flags);

		spin_unlock(&hdr->lock);

	}

include/linux/nfs_xdr.h

+1 −2
Original line number Diff line number Diff line
@@ -1263,7 +1263,7 @@ struct nfs_pgio_header { 
	struct list_head	rpc_list;

	atomic_t		refcnt;

	struct nfs_page		*req;

	struct nfs_writeverf	*verf;

	struct nfs_writeverf	verf;		/* Used for writes */

	struct pnfs_layout_segment *lseg;

	loff_t			io_start;

	const struct rpc_call_ops *mds_ops;
@@ -1297,7 +1297,6 @@ struct nfs_pgio_data { 
struct nfs_rw_header {

	struct nfs_pgio_header	header;

	struct nfs_pgio_data	rpc_data;

	struct nfs_writeverf	verf;

};



struct nfs_mds_commit_info {