| @@ -741,10 +741,10 @@ static void nfs4_open_confirm_done(struct rpc_task *task, void *calldata) · 740 unmodified lines |
| 741 | 741 | if (data->rpc_status == 0) { |
| 742 | 742 | memcpy(data->o_res.stateid.data, data->c_res.stateid.data, |
| 743 | 743 | sizeof(data->o_res.stateid.data)); |
| 744 | + nfs_confirm_seqid(&data->owner->so_seqid, 0); |
| 744 | 745 | renew_lease(data->o_res.server, data->timestamp); |
| 745 | 746 | data->rpc_done = 1; |
| 746 | 747 | } |
| 747 | | − nfs_confirm_seqid(&data->owner->so_seqid, data->rpc_status); |
| 748 | 748 | nfs_increment_open_seqid(data->rpc_status, data->c_arg.seqid); |
| 749 | 749 | } |
| 750 | 750 | |
| @@ -759,7 +759,6 @@ static void nfs4_open_confirm_release(void *calldata) · 8 unmodified lines |
| 759 | 759 | /* In case of error, no cleanup! */ |
| 760 | 760 | if (!data->rpc_done) |
| 761 | 761 | goto out_free; |
| 762 | | − nfs_confirm_seqid(&data->owner->so_seqid, 0); |
| 763 | 762 | state = nfs4_opendata_to_nfs4_state(data); |
| 764 | 763 | if (!IS_ERR(state)) |
| 765 | 764 | nfs4_close_state(&data->path, state, data->o_arg.open_flags); |
| @@ -886,7 +885,6 @@ static void nfs4_open_release(void *calldata) · 120 unmodified lines |
| 886 | 885 | /* In case we need an open_confirm, no cleanup! */ |
| 887 | 886 | if (data->o_res.rflags & NFS4_OPEN_RESULT_CONFIRM) |
| 888 | 887 | goto out_free; |
| 889 | | − nfs_confirm_seqid(&data->owner->so_seqid, 0); |
| 890 | 888 | state = nfs4_opendata_to_nfs4_state(data); |
| 891 | 889 | if (!IS_ERR(state)) |
| 892 | 890 | nfs4_close_state(&data->path, state, data->o_arg.open_flags); |
| @@ -3333,6 +3331,12 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, · 2440 unmodified lines |
| 3333 | 3331 | |
| 3334 | 3332 | p->arg.fh = NFS_FH(inode); |
| 3335 | 3333 | p->arg.fl = &p->fl; |
| 3334 | + if (!(lsp->ls_seqid.flags & NFS_SEQID_CONFIRMED)) { |
| 3335 | + p->arg.open_seqid = nfs_alloc_seqid(&lsp->ls_state->owner->so_seqid); |
| 3336 | + if (p->arg.open_seqid == NULL) |
| 3337 | + goto out_free; |
| 3338 | + |
| 3339 | + } |
| 3336 | 3340 | p->arg.lock_seqid = nfs_alloc_seqid(&lsp->ls_seqid); |
| 3337 | 3341 | if (p->arg.lock_seqid == NULL) |
| 3338 | 3342 | goto out_free; |
| @@ -3345,6 +3349,8 @@ static struct nfs4_lockdata *nfs4_alloc_lockdata(struct file_lock *fl, · 6 unmodified lines |
| 3345 | 3349 | memcpy(&p->fl, fl, sizeof(p->fl)); |
| 3346 | 3350 | return p; |
| 3347 | 3351 | out_free: |
| 3352 | + if (p->arg.open_seqid != NULL) |
| 3353 | + nfs_free_seqid(p->arg.open_seqid); |
| 3348 | 3354 | kfree(p); |
| 3349 | 3355 | return NULL; |
| 3350 | 3356 | } |
| @@ -3361,23 +3367,23 @@ static void nfs4_lock_prepare(struct rpc_task *task, void *calldata) · 10 unmodified lines |
| 3361 | 3367 | .rpc_cred = sp->so_cred, |
| 3362 | 3368 | }; |
| 3363 | 3369 | |
| 3364 | | − if (nfs_wait_on_sequence(data->arg.lock_seqid, task) != 0) |
| 3365 | | − return; |
| 3366 | 3370 | dprintk("%s: begin!\n", __FUNCTION__); |
| 3367 | 3371 | /* Do we need to do an open_to_lock_owner? */ |
| 3368 | 3372 | if (!(data->arg.lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED)) { |
| 3369 | | − data->arg.open_seqid = nfs_alloc_seqid(&sp->so_seqid); |
| 3370 | | − if (data->arg.open_seqid == NULL) { |
| 3371 | | − data->rpc_status = -ENOMEM; |
| 3372 | | − task->tk_action = NULL; |
| 3373 | | − goto out; |
| 3374 | | − } |
| 3373 | + if (nfs_wait_on_sequence(data->arg.open_seqid, task) != 0) |
| 3374 | + return; |
| 3375 | 3375 | data->arg.open_stateid = &state->stateid; |
| 3376 | 3376 | data->arg.new_lock_owner = 1; |
| 3377 | + /* Retest in case we raced... */ |
| 3378 | + if (!(data->arg.lock_seqid->sequence->flags & NFS_SEQID_CONFIRMED)) |
| 3379 | + goto do_rpc; |
| 3377 | 3380 | } |
| 3381 | + if (nfs_wait_on_sequence(data->arg.lock_seqid, task) != 0) |
| 3382 | + return; |
| 3383 | + data->arg.new_lock_owner = 0; |
| 3384 | +do_rpc: |
| 3378 | 3385 | data->timestamp = jiffies; |
| 3379 | 3386 | rpc_call_setup(task, &msg, 0); |
| 3380 | | −out: |
| 3381 | 3387 | dprintk("%s: done!, ret = %d\n", __FUNCTION__, data->rpc_status); |
| 3382 | 3388 | } |
| 3383 | 3389 | |
| @@ -3413,8 +3419,6 @@ static void nfs4_lock_release(void *calldata) · 29 unmodified lines |
| 3413 | 3419 | struct nfs4_lockdata *data = calldata; |
| 3414 | 3420 | |
| 3415 | 3421 | dprintk("%s: begin!\n", __FUNCTION__); |
| 3416 | | − if (data->arg.open_seqid != NULL) |
| 3417 | | − nfs_free_seqid(data->arg.open_seqid); |
| 3418 | 3422 | if (data->cancelled != 0) { |
| 3419 | 3423 | struct rpc_task *task; |
| 3420 | 3424 | task = nfs4_do_unlck(&data->fl, data->ctx, data->lsp, |
| @@ -3424,6 +3428,8 @@ static void nfs4_lock_release(void *calldata) · 3 unmodified lines |
| 3424 | 3428 | dprintk("%s: cancelling lock!\n", __FUNCTION__); |
| 3425 | 3429 | } else |
| 3426 | 3430 | nfs_free_seqid(data->arg.lock_seqid); |
| 3431 | + if (data->arg.open_seqid != NULL) |
| 3432 | + nfs_free_seqid(data->arg.open_seqid); |
| 3427 | 3433 | nfs4_put_lock_state(data->lsp); |
| 3428 | 3434 | put_nfs_open_context(data->ctx); |
| 3429 | 3435 | kfree(data); |