diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2016-01-04 11:28:11 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-01-04 12:36:12 -0500 |
| commit | 4b0934baf9317e05c7568da1366a1d65f151d81f (patch) | |
| tree | 471df710b857f344eb684e401de1a6e77697fd98 /fs/nfs | |
| parent | NFSv4.1/pNFS: pnfs_error_mark_layout_for_return() must always return layout (diff) | |
| download | linux-dev-4b0934baf9317e05c7568da1366a1d65f151d81f.tar.xz linux-dev-4b0934baf9317e05c7568da1366a1d65f151d81f.zip | |
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>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/callback_proc.c | 5 |
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; } |