diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-23 13:40:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-23 13:40:55 -0700 |
| commit | 12a54b150fb5b6c2f3da932dc0e665355f8a5a48 (patch) | |
| tree | fa5d6becf0392244d4a44cc6afdbc93e363689d1 /fs/nfsd/state.h | |
| parent | d286e13d53f54b00bcd7443eedd067cd432cf547 (diff) | |
| parent | f456458e4d25a8962d0946891617c76cc3ff5fb9 (diff) | |
| download | linux-12a54b150fb5b6c2f3da932dc0e665355f8a5a48.tar.bz2 | |
Merge tag 'nfsd-5.1-1' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Fix miscellaneous nfsd bugs, in NFSv4.1 callbacks, NFSv4.1
lock-notification callbacks, NFSv3 readdir encoding, and the
cache/upcall code"
* tag 'nfsd-5.1-1' of git://linux-nfs.org/~bfields/linux:
nfsd: wake blocked file lock waiters before sending callback
nfsd: wake waiters blocked on file_lock before deleting it
nfsd: Don't release the callback slot unless it was actually held
nfsd/nfsd3_proc_readdir: fix buffer count and page pointers
sunrpc: don't mark uninitialised items as VALID.
Diffstat (limited to 'fs/nfsd/state.h')
| -rw-r--r-- | fs/nfsd/state.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 396c76755b03..9d6cb246c6c5 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -70,6 +70,7 @@ struct nfsd4_callback { int cb_seq_status; int cb_status; bool cb_need_restart; + bool cb_holds_slot; }; struct nfsd4_callback_ops { |