diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-07-12 19:10:59 -0400 |
|---|---|---|
| committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-07-19 15:28:21 -0400 |
| commit | 213297369cf4900eba906dd32ce845074e30f487 (patch) | |
| tree | 08d79c933859686df4b902b86f247cd17b95ce14 /fs/nfs | |
| parent | 4b75053e9bb6db4b700526d2d67c67a0d07f867e (diff) | |
| download | op-kernel-dev-213297369cf4900eba906dd32ce845074e30f487.zip op-kernel-dev-213297369cf4900eba906dd32ce845074e30f487.tar.gz | |
Revert commit 722f0b891198 ("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: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/pnfs_nfs.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/fs/nfs/pnfs_nfs.c b/fs/nfs/pnfs_nfs.c index 7ceb866..25f28fa 100644 --- a/fs/nfs/pnfs_nfs.c +++ b/fs/nfs/pnfs_nfs.c @@ -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; |
