Revert commit 722f0b891198 ("pNFS: Don't send COMMITs to the DSes if...")
authorTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 12 Jul 2017 23:10:59 +0000 (19:10 -0400)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Wed, 19 Jul 2017 19:28:21 +0000 (15:28 -0400)
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: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/pnfs_nfs.c

index 7ceb86627e547531563d597a83e424ce0fda6d2c..25f28fa64c575129130d916d566674da792376ae 100644 (file)
@@ -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;