diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-06-25 16:35:53 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-07-30 14:41:56 -0400 |
commit | f11ac8db5d07b6e99d41ff4aa39d878ee5cef1c5 (patch) | |
tree | 4393cbc2653145ba3269d5143f5db7811a59698b /include/linux/nfs_xdr.h | |
parent | 1f0e890dba5b0f543fea47732116b1c65d55614e (diff) |
NFSv4: Ensure that we track the NFSv4 lock state in read/write requests.
This patch fixes bugzilla entry 14501:
https://bugzilla.kernel.org/show_bug.cgi?id=14501
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_xdr.h')
-rw-r--r-- | include/linux/nfs_xdr.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index a319cb926abf..87202c7026e3 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h | |||
@@ -334,6 +334,7 @@ struct nfs4_delegreturnres { | |||
334 | struct nfs_readargs { | 334 | struct nfs_readargs { |
335 | struct nfs_fh * fh; | 335 | struct nfs_fh * fh; |
336 | struct nfs_open_context *context; | 336 | struct nfs_open_context *context; |
337 | struct nfs_lock_context *lock_context; | ||
337 | __u64 offset; | 338 | __u64 offset; |
338 | __u32 count; | 339 | __u32 count; |
339 | unsigned int pgbase; | 340 | unsigned int pgbase; |
@@ -354,6 +355,7 @@ struct nfs_readres { | |||
354 | struct nfs_writeargs { | 355 | struct nfs_writeargs { |
355 | struct nfs_fh * fh; | 356 | struct nfs_fh * fh; |
356 | struct nfs_open_context *context; | 357 | struct nfs_open_context *context; |
358 | struct nfs_lock_context *lock_context; | ||
357 | __u64 offset; | 359 | __u64 offset; |
358 | __u32 count; | 360 | __u32 count; |
359 | enum nfs3_stable_how stable; | 361 | enum nfs3_stable_how stable; |