summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 14:20:15 -0700
committerTrond Myklebust <Trond.Myklebust@netapp.com>2005-10-18 14:20:15 -0700
commit06735b3454824bd561decbde46111f144e905923 (patch)
tree2c9e9f18ba8d3700a181b44d2b1f0ce6a62612f8 /include
parentfaf5f49c2d9c0af2847837c232a432cc146e203b (diff)
NFSv4: Fix up handling of open_to_lock sequence ids
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_xdr.h19
1 files changed, 4 insertions, 15 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 849f95c5fae..57efcc27f20 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -165,25 +165,14 @@ struct nfs_lowner {
u32 id;
};
-struct nfs_open_to_lock {
- struct nfs_seqid * open_seqid;
- nfs4_stateid open_stateid;
+struct nfs_lock_opargs {
struct nfs_seqid * lock_seqid;
+ nfs4_stateid * lock_stateid;
+ struct nfs_seqid * open_seqid;
+ nfs4_stateid * open_stateid;
struct nfs_lowner lock_owner;
-};
-
-struct nfs_exist_lock {
- nfs4_stateid stateid;
- struct nfs_seqid * seqid;
-};
-
-struct nfs_lock_opargs {
__u32 reclaim;
__u32 new_lock_owner;
- union {
- struct nfs_open_to_lock *open_lock;
- struct nfs_exist_lock *exist_lock;
- } u;
};
struct nfs_locku_opargs {