diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-08-16 17:01:21 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-08-20 18:38:36 -0400 |
| commit | 39307655a1effa8d913bba054c0e985bfaca808c (patch) | |
| tree | 444839c0cc97415f931fbd24b4548d2c93a38d1a /fs/nfsd/state.h | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| download | blackbird-op-linux-39307655a1effa8d913bba054c0e985bfaca808c.tar.gz blackbird-op-linux-39307655a1effa8d913bba054c0e985bfaca808c.zip | |
nfsd4: fix security flavor of NFSv4.0 callback
Commit d5497fc693a446ce9100fcf4117c3f795ddfd0d2 "nfsd4: move rq_flavor
into svc_cred" forgot to remove cl_flavor from the client, leaving two
places (cl_flavor and cl_cred.cr_flavor) for the flavor to be stored.
After that patch, the latter was the one that was updated, but the
former was the one that the callback used.
Symptoms were a long delay on utime(). This is because the utime()
generated a setattr which recalled a delegation, but the cb_recall was
ignored by the client because it had the wrong security flavor.
Cc: stable@vger.kernel.org
Tested-by: Jamie Heilman <jamie@audible.transient.net>
Reported-by: Jamie Heilman <jamie@audible.transient.net>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index e6173147f982..22bd0a66c356 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -231,7 +231,6 @@ struct nfs4_client { nfs4_verifier cl_verifier; /* generated by client */ time_t cl_time; /* time of last lease renewal */ struct sockaddr_storage cl_addr; /* client ipaddress */ - u32 cl_flavor; /* setclientid pseudoflavor */ struct svc_cred cl_cred; /* setclientid principal */ clientid_t cl_clientid; /* generated by server */ nfs4_verifier cl_confirm; /* generated by server */ |
