| Message ID | 1425332769-7047-1-git-send-email-Anna.Schumaker@Netapp.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Mar 2, 2015 at 4:46 PM, Anna Schumaker <Anna.Schumaker@netapp.com> wrote: > After 566fcec60 the client uses the "current stateid" from the > nfs4_state structure to close a file. This could potentially contain a > delegation stateid, which is disallowed by the protocol and causes > servers to return NFS4ERR_BAD_STATEID. This patch restores the > (correct) behavior of sending the open stateid to close a file. > > Reported-by: Olga Kornievskaia <kolga@netapp.com> > Fixes: 566fcec60 (NFSv4: Fix an atomicity problem in CLOSE) > Signed-off-by: Anna Schumaker <Anna.Schumaker@netapp.com> > --- > fs/nfs/nfs4proc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > index a211daf..7b409ff 100644 > --- a/fs/nfs/nfs4proc.c > +++ b/fs/nfs/nfs4proc.c > @@ -2691,7 +2691,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) > is_rdwr = test_bit(NFS_O_RDWR_STATE, &state->flags); > is_rdonly = test_bit(NFS_O_RDONLY_STATE, &state->flags); > is_wronly = test_bit(NFS_O_WRONLY_STATE, &state->flags); > - nfs4_stateid_copy(&calldata->arg.stateid, &state->stateid); > + nfs4_stateid_copy(&calldata->arg.stateid, &state->open_stateid); > /* Calculate the change in open mode */ > calldata->arg.fmode = 0; > if (state->n_rdwr == 0) { Can you please also fix up nfs4_close_done(). Thanks!
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index a211daf..7b409ff 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -2691,7 +2691,7 @@ static void nfs4_close_prepare(struct rpc_task *task, void *data) is_rdwr = test_bit(NFS_O_RDWR_STATE, &state->flags); is_rdonly = test_bit(NFS_O_RDONLY_STATE, &state->flags); is_wronly = test_bit(NFS_O_WRONLY_STATE, &state->flags); - nfs4_stateid_copy(&calldata->arg.stateid, &state->stateid); + nfs4_stateid_copy(&calldata->arg.stateid, &state->open_stateid); /* Calculate the change in open mode */ calldata->arg.fmode = 0; if (state->n_rdwr == 0) {
After 566fcec60 the client uses the "current stateid" from the nfs4_state structure to close a file. This could potentially contain a delegation stateid, which is disallowed by the protocol and causes servers to return NFS4ERR_BAD_STATEID. This patch restores the (correct) behavior of sending the open stateid to close a file. Reported-by: Olga Kornievskaia <kolga@netapp.com> Fixes: 566fcec60 (NFSv4: Fix an atomicity problem in CLOSE) Signed-off-by: Anna Schumaker <Anna.Schumaker@netapp.com> --- fs/nfs/nfs4proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)