Commit b6a85258d8223a87e7ecf25791e634617a159f79
Committed by
Trond Myklebust
Trond Myklebust
1 parent
1cec16abf2
Exists in
smarc-imx_3.14.28_1.0.0_ga
and in
1 other branch
NFS: Fix warning introduced by NFSv4.0 transport blocking patches
When CONFIG_NFS_V4_1 is not enabled, gcc emits this warning:
linux/fs/nfs/nfs4state.c:255:12: warning:
‘nfs4_begin_drain_session’ defined but not used [-Wunused-function]
static int nfs4_begin_drain_session(struct nfs_client *clp)
^
Eventually NFSv4.0 migration recovery will invoke this function, but
that has not yet been merged. Hide nfs4_begin_drain_session()
behind CONFIG_NFS_V4_1 for now.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff
fs/nfs/nfs4state.c
| ... | ... | @@ -239,6 +239,8 @@ |
| 239 | 239 | } |
| 240 | 240 | } |
| 241 | 241 | |
| 242 | +#if defined(CONFIG_NFS_V4_1) | |
| 243 | + | |
| 242 | 244 | static int nfs4_drain_slot_tbl(struct nfs4_slot_table *tbl) |
| 243 | 245 | { |
| 244 | 246 | set_bit(NFS4_SLOT_TBL_DRAINING, &tbl->slot_tbl_state); |
| ... | ... | @@ -267,8 +269,6 @@ |
| 267 | 269 | /* fore channel */ |
| 268 | 270 | return nfs4_drain_slot_tbl(&ses->fc_slot_table); |
| 269 | 271 | } |
| 270 | - | |
| 271 | -#if defined(CONFIG_NFS_V4_1) | |
| 272 | 272 | |
| 273 | 273 | static int nfs41_setup_state_renewal(struct nfs_client *clp) |
| 274 | 274 | { |