diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:47:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-18 22:47:13 -0700 |
| commit | 35a21b429917baf86d7595826e7314662ec09d0a (patch) | |
| tree | b60e4451fe84fe113fbb98ef09733cd2071998bb /fs/nfs/callback.h | |
| parent | 5c80c71b9a0ec518b4b58d2a61de01a04f4a4453 (diff) | |
| parent | 910ac68a2b80c7de95bc8488734067b1bb15d583 (diff) | |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
pnfs-obj: Fix the comp_index != 0 case
pnfs-obj: Bug when we are running out of bio
nfs: add missing prefetch.h include
Diffstat (limited to 'fs/nfs/callback.h')
| -rw-r--r-- | fs/nfs/callback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h index b257383bb565..07df5f1d85e5 100644 --- a/fs/nfs/callback.h +++ b/fs/nfs/callback.h @@ -38,6 +38,7 @@ enum nfs4_callback_opnum { struct cb_process_state { __be32 drc_status; struct nfs_client *clp; + int slotid; }; struct cb_compound_hdr_arg { @@ -166,7 +167,6 @@ extern unsigned nfs4_callback_layoutrecall( void *dummy, struct cb_process_state *cps); extern void nfs4_check_drain_bc_complete(struct nfs4_session *ses); -extern void nfs4_cb_take_slot(struct nfs_client *clp); struct cb_devicenotifyitem { uint32_t cbd_notify_type; |