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

Revert commit 722f0b89 ("pNFS: Don't send COMMITs to the DSes if...") 



Doing the test without taking any locks is racy, and so really it makes
more sense to do it in the flexfiles code (which is the only case that
cares).

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 4b75053e

fs/nfs/pnfs_nfs.c

+0 −7
Original line number Diff line number Diff line
@@ -224,13 +224,6 @@ pnfs_generic_alloc_ds_commits(struct nfs_commit_info *cinfo, 
	for (i = 0; i < fl_cinfo->nbuckets; i++, bucket++) {

		if (list_empty(&bucket->committing))

			continue;

		/*

		 * If the layout segment is invalid, then let

		 * pnfs_generic_retry_commit() clean up the bucket.

		 */

		if (bucket->clseg && !pnfs_is_valid_lseg(bucket->clseg) &&

		    !test_bit(NFS_LSEG_LAYOUTRETURN, &bucket->clseg->pls_flags))

			break;

		data = nfs_commitdata_alloc(false);

		if (!data)

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE