diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-02 20:56:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-02 20:56:44 -0700 |
| commit | 19ec50a438c2ea3e370f6d453bf2f2e6e45ef72b (patch) | |
| tree | 303c0b140fd24d4de3f8aacfdc5e8abf9e6946ef /include | |
| parent | 9f5af546e6acc30f075828cb58c7f09665033967 (diff) | |
| parent | d9cb73300ac0001832c048a489c592263fc28193 (diff) | |
| download | linux-19ec50a438c2ea3e370f6d453bf2f2e6e45ef72b.tar.bz2 | |
Merge tag 'nfs-for-4.13-4' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull NFS client fixes from Anna Schumaker:
"Two fixes from Trond this time, now that he's back from his vacation.
The first is a stable fix for the EXCHANGE_ID issue on the mailing
list, and the other fixes a double-free situation that he found at the
same time.
Stable fix:
- Fix EXCHANGE_ID corrupt verifier issue
Other fix:
- Fix double frees in nfs4_test_session_trunk()"
* tag 'nfs-for-4.13-4' of git://git.linux-nfs.org/projects/anna/linux-nfs:
NFSv4: Fix double frees in nfs4_test_session_trunk()
NFSv4: Fix EXCHANGE_ID corrupt verifier issue
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nfs_xdr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index ca3bcc4ed4e5..62cbcb842f99 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -1235,7 +1235,7 @@ struct nfs41_state_protection { struct nfs41_exchange_id_args { struct nfs_client *client; - nfs4_verifier *verifier; + nfs4_verifier verifier; u32 flags; struct nfs41_state_protection state_protect; }; |