diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-31 09:28:06 -0500 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-31 15:55:35 -0500 |
| commit | b20135d0b2431900a3a5395970ffb7e4f3767c8b (patch) | |
| tree | 480ca93f19626e451cb79b35f29ad86d28da0fbb /fs/nfs/callback_proc.c | |
| parent | NFS: Allow multiple commit requests in flight per file (diff) | |
| download | linux-dev-b20135d0b2431900a3a5395970ffb7e4f3767c8b.tar.xz linux-dev-b20135d0b2431900a3a5395970ffb7e4f3767c8b.zip | |
NFSv4.1/pNFS: Don't queue up a new commit if the layout segment is invalid
If the layout segment is invalid, then we should not be adding more
write requests to the commit list. Instead, those writes should be
replayed after requesting a new layout.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/callback_proc.c')
| -rw-r--r-- | fs/nfs/callback_proc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c index e4dbab5dce6e..2be8b252e3b1 100644 --- a/fs/nfs/callback_proc.c +++ b/fs/nfs/callback_proc.c @@ -233,6 +233,8 @@ static u32 initiate_file_draining(struct nfs_client *clp, unlock: spin_unlock(&ino->i_lock); pnfs_free_lseg_list(&free_me_list); + /* Free all lsegs that are attached to commit buckets */ + nfs_commit_inode(ino, 0); pnfs_put_layout_hdr(lo); trace_nfs4_cb_layoutrecall_file(clp, &args->cbl_fh, ino, &args->cbl_stateid, -rv); |