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

Commit a5314a74 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Ensure we reset the write verifier 'committed' value on resend. 



Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 8fc3c386

fs/nfs/direct.c

+2 −0
Original line number Diff line number Diff line
@@ -661,6 +661,8 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) 
	nfs_direct_write_scan_commit_list(dreq->inode, &reqs, &cinfo);



	dreq->count = 0;

	dreq->verf.committed = NFS_INVALID_STABLE_HOW;

	nfs_clear_pnfs_ds_commit_verifiers(&dreq->ds_cinfo);

	for (i = 0; i < dreq->mirror_count; i++)

		dreq->mirrors[i].count = 0;

	get_dreq(dreq);

fs/nfs/internal.h

+17 −0
Original line number Diff line number Diff line
@@ -499,6 +499,23 @@ int nfs_key_timeout_notify(struct file *filp, struct inode *inode); 
bool nfs_ctx_key_to_expire(struct nfs_open_context *ctx);

void nfs_pageio_stop_mirroring(struct nfs_pageio_descriptor *pgio);



#ifdef CONFIG_NFS_V4_1

static inline

void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)

{

	int i;



	for (i = 0; i < cinfo->nbuckets; i++)

		cinfo->buckets[i].direct_verf.committed = NFS_INVALID_STABLE_HOW;

}

#else

static inline

void nfs_clear_pnfs_ds_commit_verifiers(struct pnfs_ds_commit_info *cinfo)

{

}

#endif





#ifdef CONFIG_MIGRATION

extern int nfs_migrate_page(struct address_space *,

		struct page *, struct page *, enum migrate_mode);