Commit 6920b4ad authored by Stefan Metzmacher's avatar Stefan Metzmacher Committed by Steve French
Browse files

smb: smbdirect: let smbdirect_socket_init() initialize all [delayed_]work_structs as disabled 



This safer to start with and allows common code not care about if the
caller uses these or not. E.g. sc->mr_io.recovery_work is only used
on the client...

Note disable_[delayed_]work_sync() requires a valid function pointer
in INIT_[DELAYED_]WORK(). The non _sync() version don't require it,
but as we need to use the _sync() version on cleanup we better use
it here too, it won't block anyway here...

Cc: Steve French <smfrench@gmail.com>
Cc: Tom Talpey <tom@talpey.com>
Cc: Long Li <longli@microsoft.com>
Acked-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
Cc: linux-cifs@vger.kernel.org
Cc: samba-technical@lists.samba.org
Signed-off-by: default avatarStefan Metzmacher <metze@samba.org>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent ed3350f0

fs/smb/common/smbdirect/smbdirect_socket.h

+20 −0
Original line number Diff line number Diff line
@@ -277,6 +277,14 @@ struct smbdirect_socket { 
	} statistics;

};



static void __smbdirect_socket_disabled_work(struct work_struct *work)

{

	/*

	 * Should never be called as disable_[delayed_]work_sync() was used.

	 */

	WARN_ON_ONCE(1);

}



static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc)

{

	/*
@@ -287,6 +295,14 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) 


	init_waitqueue_head(&sc->status_wait);



	INIT_WORK(&sc->disconnect_work, __smbdirect_socket_disabled_work);

	disable_work_sync(&sc->disconnect_work);



	INIT_WORK(&sc->idle.immediate_work, __smbdirect_socket_disabled_work);

	disable_work_sync(&sc->idle.immediate_work);

	INIT_DELAYED_WORK(&sc->idle.timer_work, __smbdirect_socket_disabled_work);

	disable_delayed_work_sync(&sc->idle.timer_work);



	atomic_set(&sc->send_io.credits.count, 0);

	init_waitqueue_head(&sc->send_io.credits.wait_queue);
@@ -298,6 +314,8 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) 
	spin_lock_init(&sc->recv_io.free.lock);



	atomic_set(&sc->recv_io.posted.count, 0);

	INIT_WORK(&sc->recv_io.posted.refill_work, __smbdirect_socket_disabled_work);

	disable_work_sync(&sc->recv_io.posted.refill_work);



	atomic_set(&sc->recv_io.credits.count, 0);
@@ -313,6 +331,8 @@ static __always_inline void smbdirect_socket_init(struct smbdirect_socket *sc) 
	atomic_set(&sc->mr_io.ready.count, 0);

	init_waitqueue_head(&sc->mr_io.ready.wait_queue);

	atomic_set(&sc->mr_io.used.count, 0);

	INIT_WORK(&sc->mr_io.recovery_work, __smbdirect_socket_disabled_work);

	disable_work_sync(&sc->mr_io.recovery_work);

	init_waitqueue_head(&sc->mr_io.cleanup.wait_queue);

}