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

Linus Torvalds committed 9 years ago

Commit 19ec50a2 parents 9f5af54 d9cb7334 files · +9 −25Browse files

Showing the changes to include/linux (1 of 4 files). Show all

Unified · Split

include/linux/nfs_xdr.h+1−1

@@ -1235,7 +1235,7 @@ struct nfs41_state_protection { · 1234 unmodified lines
1235	1235
1236	1236	struct nfs41_exchange_id_args {
1237	1237	struct nfs_client *client;
1238		− nfs4_verifier *verifier;
	1238	+ nfs4_verifier verifier;
1239	1239	u32 flags;
1240	1240	struct nfs41_state_protection state_protect;
1241	1241	};