aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfs_xdr.h
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-01-24 14:57:53 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-01-24 18:46:47 -0500
commit425c1d4e5b6d4bd700eb94ad8318bdb05431fdc7 (patch)
tree85d4d8d82cf0e33b85a8d348e8c143d3d6c6396d /include/linux/nfs_xdr.h
parent6b447539aa9aaac0a0215f3e28a0839553210e7e (diff)
NFSv4: Fix lock on-wire reordering issues
This patch ensures that the server cannot reorder our LOCK/LOCKU requests if they are sent in parallel on the wire. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'include/linux/nfs_xdr.h')
-rw-r--r--include/linux/nfs_xdr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 7e38d641236e..b6a6953c0f09 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -416,9 +416,9 @@ struct nfs_lock_args {
416 struct nfs_fh * fh; 416 struct nfs_fh * fh;
417 struct file_lock * fl; 417 struct file_lock * fl;
418 struct nfs_seqid * lock_seqid; 418 struct nfs_seqid * lock_seqid;
419 nfs4_stateid * lock_stateid; 419 nfs4_stateid lock_stateid;
420 struct nfs_seqid * open_seqid; 420 struct nfs_seqid * open_seqid;
421 nfs4_stateid * open_stateid; 421 nfs4_stateid open_stateid;
422 struct nfs_lowner lock_owner; 422 struct nfs_lowner lock_owner;
423 unsigned char block : 1; 423 unsigned char block : 1;
424 unsigned char reclaim : 1; 424 unsigned char reclaim : 1;
@@ -437,7 +437,7 @@ struct nfs_locku_args {
437 struct nfs_fh * fh; 437 struct nfs_fh * fh;
438 struct file_lock * fl; 438 struct file_lock * fl;
439 struct nfs_seqid * seqid; 439 struct nfs_seqid * seqid;
440 nfs4_stateid * stateid; 440 nfs4_stateid stateid;
441}; 441};
442 442
443struct nfs_locku_res { 443struct nfs_locku_res {