mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
NFSv4: Don't discard segments marked for return in _pnfs_return_layout()
commitde144ff423upstream. If the pNFS layout segment is marked with the NFS_LSEG_LAYOUTRETURN flag, then the assumption is that it has some reporting requirement to perform through a layoutreturn (e.g. flexfiles layout stats or error information). Fixes:6d597e1750("pnfs: only tear down lsegs that precede seqid in LAYOUTRETURN args") Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
12ccd59941
commit
6be0e4b593
@@ -1311,7 +1311,7 @@ _pnfs_return_layout(struct inode *ino)
|
||||
}
|
||||
valid_layout = pnfs_layout_is_valid(lo);
|
||||
pnfs_clear_layoutcommit(ino, &tmp_list);
|
||||
pnfs_mark_matching_lsegs_invalid(lo, &tmp_list, NULL, 0);
|
||||
pnfs_mark_matching_lsegs_return(lo, &tmp_list, NULL, 0);
|
||||
|
||||
if (NFS_SERVER(ino)->pnfs_curr_ld->return_range) {
|
||||
struct pnfs_layout_range range = {
|
||||
|
||||
Reference in New Issue
Block a user