diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-11 14:42:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-11 14:42:52 -0700 |
| commit | 4cfceaf0c087f47033f5e61a801f4136d6fb68c6 (patch) | |
| tree | 59e15849506b505daf2298ed333fd04cda38e22c /fs/nfsd/xdr4.h | |
| parent | ef208162b7b4c40de1825a61677e167c081f5fee (diff) | |
| parent | 4bd9e9b77fc6787c45b8bb439f6511aa3478606c (diff) | |
| download | blackbird-op-linux-4cfceaf0c087f47033f5e61a801f4136d6fb68c6.tar.gz blackbird-op-linux-4cfceaf0c087f47033f5e61a801f4136d6fb68c6.zip | |
Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Mainly pnfs fixes (and for problems with generic callback code made
more obvious by pnfs)"
* 'for-4.1' of git://linux-nfs.org/~bfields/linux:
nfsd: skip CB_NULL probes for 4.1 or later
nfsd: fix callback restarts
nfsd: split transport vs operation errors for callbacks
svcrpc: fix potential GSSX_ACCEPT_SEC_CONTEXT decoding failures
nfsd: fix pNFS return on close semantics
nfsd: fix the check for confirmed openowner in nfs4_preprocess_stateid_op
nfsd/blocklayout: pretend we can send deviceid notifications
Diffstat (limited to 'fs/nfsd/xdr4.h')
| -rw-r--r-- | fs/nfsd/xdr4.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/xdr4.h b/fs/nfsd/xdr4.h index f982ae84f0cd..2f8c092be2b3 100644 --- a/fs/nfsd/xdr4.h +++ b/fs/nfsd/xdr4.h @@ -247,6 +247,7 @@ struct nfsd4_open { struct nfs4_openowner *op_openowner; /* used during processing */ struct nfs4_file *op_file; /* used during processing */ struct nfs4_ol_stateid *op_stp; /* used during processing */ + struct nfs4_clnt_odstate *op_odstate; /* used during processing */ struct nfs4_acl *op_acl; struct xdr_netobj op_label; }; |
