Skip to content

Commit

Permalink
nfs: fix layoutreturn operation handling regression
Browse files Browse the repository at this point in the history
Fixes "ea97bbf: libs: use nfs4j-0.19.0"

Acked-by: Albert Rossi
Target: master
Require-book: no
Require-notes: no
  • Loading branch information
kofemann committed Sep 16, 2019
1 parent 26c20f2 commit c8cf843
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -776,7 +776,7 @@ private void logLayoutErrors(CompoundContext context, ff_layoutreturn4 lr) {
@Override
public void layoutReturn(CompoundContext context, LAYOUTRETURN4args args) throws IOException {

if (args.lora_layout_type == layoutreturn_type4.LAYOUTRETURN4_FILE) {
if (args.lora_layoutreturn.lr_returntype == layoutreturn_type4.LAYOUTRETURN4_FILE) {
layouttype4 layoutType = layouttype4.valueOf(args.lora_layout_type);
final stateid4 stateid = Stateids.getCurrentStateidIfNeeded(context, args.lora_layoutreturn.lr_layout.lrf_stateid);

Expand Down Expand Up @@ -1685,7 +1685,7 @@ public void run() {
* kill the transfer, as client will create a new one.
*/
_log.debug("forgetful client model");
transfer.killMover(0, "Pool disabled");
transfer.killMover(0, "layout recall");
} catch (DelayException e) {
// probably we hit in the middle of IO, try again
_log.debug("Client can't return layout: re-scheduling layout recall");
Expand Down

0 comments on commit c8cf843

Please sign in to comment.