Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb067935 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS/flexfiles: Fix ff_layout_add_ds_error_locked()



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: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 7a0566b3
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -254,8 +254,9 @@ ff_layout_add_ds_error_locked(struct nfs4_flexfile_layout *flo,
		}
		/* Entries match, so merge "err" into "dserr" */
		extend_ds_error(dserr, err->offset, err->length);
		list_del(&err->list);
		list_replace(&err->list, &dserr->list);
		kfree(err);
		return;
	}

	list_add_tail(&dserr->list, head);