diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2013-09-04 12:26:03 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-04 12:26:30 -0400 |
| commit | 1cec16abf23d644b0e261956cb2b37a668354f5a (patch) | |
| tree | fb2c26c48d401a89b7e2e05fe3efa4af0789bfbb /fs | |
| parent | 2cf8bca8b9980c58eab9f2f47586eb16a6e63300 (diff) | |
| download | op-kernel-dev-1cec16abf23d644b0e261956cb2b37a668354f5a.zip op-kernel-dev-1cec16abf23d644b0e261956cb2b37a668354f5a.tar.gz | |
When CONFIG_NFS_V4_1 is not enabled, "make C=2" emits this warning:
linux/fs/nfs/nfs4session.c:337:6: warning:
symbol 'nfs41_set_target_slotid' was not declared. Should it be static?
Move nfs41_set_target_slotid() and nfs41_update_target_slotid() back
behind CONFIG_NFS_V4_1, since, in the final revision of this work,
they are used only in NFSv4.1 and later.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfs/nfs4session.c | 4 | ||||
| -rw-r--r-- | fs/nfs/nfs4session.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/nfs/nfs4session.c b/fs/nfs/nfs4session.c index e0bf666..cf883c7 100644 --- a/fs/nfs/nfs4session.c +++ b/fs/nfs/nfs4session.c @@ -310,6 +310,8 @@ void nfs41_wake_slot_table(struct nfs4_slot_table *tbl) } } +#if defined(CONFIG_NFS_V4_1) + static void nfs41_set_max_slotid_locked(struct nfs4_slot_table *tbl, u32 target_highest_slotid) { @@ -420,8 +422,6 @@ void nfs41_update_target_slotid(struct nfs4_slot_table *tbl, spin_unlock(&tbl->slot_tbl_lock); } -#if defined(CONFIG_NFS_V4_1) - static void nfs4_destroy_session_slot_tables(struct nfs4_session *session) { nfs4_release_slot_table(&session->fc_slot_table); diff --git a/fs/nfs/nfs4session.h b/fs/nfs/nfs4session.h index bfb0fe3..2323061 100644 --- a/fs/nfs/nfs4session.h +++ b/fs/nfs/nfs4session.h @@ -78,9 +78,6 @@ extern void nfs4_release_slot_table(struct nfs4_slot_table *tbl); extern struct nfs4_slot *nfs4_alloc_slot(struct nfs4_slot_table *tbl); extern void nfs4_free_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot); extern void nfs4_slot_tbl_drain_complete(struct nfs4_slot_table *tbl); -extern void nfs41_update_target_slotid(struct nfs4_slot_table *tbl, - struct nfs4_slot *slot, - struct nfs4_sequence_res *res); bool nfs41_wake_and_assign_slot(struct nfs4_slot_table *tbl, struct nfs4_slot *slot); void nfs41_wake_slot_table(struct nfs4_slot_table *tbl); @@ -93,6 +90,9 @@ static inline bool nfs4_slot_tbl_draining(struct nfs4_slot_table *tbl) #if defined(CONFIG_NFS_V4_1) extern void nfs41_set_target_slotid(struct nfs4_slot_table *tbl, u32 target_highest_slotid); +extern void nfs41_update_target_slotid(struct nfs4_slot_table *tbl, + struct nfs4_slot *slot, + struct nfs4_sequence_res *res); extern int nfs4_setup_session_slot_tables(struct nfs4_session *ses); |
