diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-20 19:24:51 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-20 23:14:28 -0400 |
commit | 95b72eb0bdef6476b7e73061f0382adf46c5495a (patch) | |
tree | db1cbb01793ac5f744defb73e869373fefb7d0ce /include/linux | |
parent | 98a2139f4f4d7b5fcc3a54c7fddbe88612abed20 (diff) | |
download | linux-3.10-95b72eb0bdef6476b7e73061f0382adf46c5495a.tar.gz linux-3.10-95b72eb0bdef6476b7e73061f0382adf46c5495a.tar.bz2 linux-3.10-95b72eb0bdef6476b7e73061f0382adf46c5495a.zip |
NFSv4: Ensure we do not reuse open owner names
The NFSv4 spec is ambiguous about whether or not it is permissible
to reuse open owner names, so play it safe. This patch adds a timestamp
to the state_owner structure, and combines that with the IDA based
uniquifier.
Fixes a regression whereby the Linux server returns NFS4ERR_BAD_SEQID.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/nfs_xdr.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index bfd0d1bf670..7ba3551a041 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -312,6 +312,11 @@ struct nfs4_layoutreturn { int rpc_status; }; +struct stateowner_id { + __u64 create_time; + __u32 uniquifier; +}; + /* * Arguments to the open call. */ @@ -321,7 +326,7 @@ struct nfs_openargs { int open_flags; fmode_t fmode; __u64 clientid; - __u64 id; + struct stateowner_id id; union { struct { struct iattr * attrs; /* UNCHECKED, GUARDED */ |