NFSv4.1/pNFS: Fix a race in initiate_file_draining()

Peng Tao points out that the call to pnfs_mark_matching_lsegs_return()
could race with pnfs_put_lseg(), in which case the layout segment is
cleared, but no layoutreturn will be sent.
Fix is to replace the call to pnfs_mark_matching_lsegs_invalid().

Reported-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 2be8b252e3b1..f0939d097406 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -216,11 +216,8 @@ static u32 initiate_file_draining(struct nfs_client *clp,
                 goto unlock;
         }
 
-        if (pnfs_mark_matching_lsegs_invalid(lo, &free_me_list,
+        if (pnfs_mark_matching_lsegs_return(lo, &free_me_list,
                                         &args->cbl_range)) {
-                pnfs_mark_matching_lsegs_return(lo,
-                                &free_me_list,
-                                &args->cbl_range);
                 rv = NFS4_OK;
                 goto unlock;
         }