Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cec16ab authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2cf8bca8

fs/nfs/nfs4session.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/nfs/nfs4session.h

+3 −3
Original line number Diff line number Diff line
@@ -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);