leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pNFS/flexfiles: Fix ff_layout_add_ds_error_locked()

Browse Source 
When we're merging an old entry into our new entry, we want to ensure that
we add the list entry in the correct place.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Trond Myklebust 2016-12-06 12:00:51 -05:00
parent 7a0566b38c
commit cb06793517
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/nfs/flexfilelayout/flexfilelayoutdev.c
View File

@ -254,8 +254,9 @@ ff_layout_add_ds_error_locked(struct nfs4_flexfile_layout *flo,
} }
/* Entries match, so merge "err" into "dserr" */ /* Entries match, so merge "err" into "dserr" */
extend_ds_error(dserr, err->offset, err->length); extend_ds_error(dserr, err->offset, err->length);
list_del(&err->list); list_replace(&err->list, &dserr->list);
kfree(err); kfree(err);
return;
} }
list_add_tail(&dserr->list, head); list_add_tail(&dserr->list, head);