fs/cifs: Fix build warnings

PATCH In review Thierry Reding 2 participants 2 messages Jul 14, 2014

Subsystems (2)

SMB client (CIFS) Kernel SMB3 server (ksmbd)

lore

Share & tools

lore

Thierry Reding

author

2014-07-14 10:38 UTC #0 lore raw

PATCH 1/1 fs/cifs: Fix build warnings

From: Thierry Reding <[email protected]>

The sess_alloc_buffer(), sess_free_buffer(), sess_establish_session() and sess_sendreceive() functions are only used by sess_auth_lanman(), therefore should be guarded by the same #ifdef to prevent the following compiler warnings:

fs/cifs/sess.c:542:1: warning: 'sess_alloc_buffer' defined but not used [-Wunused-function]
sess_alloc_buffer(struct sess_data *sess_data, int wct)
^
fs/cifs/sess.c:580:1: warning: 'sess_free_buffer' defined but not used [-Wunused-function]
sess_free_buffer(struct sess_data *sess_data)
^
fs/cifs/sess.c:589:1: warning: 'sess_establish_session' defined but not used [-Wunused-function]
sess_establish_session(struct sess_data *sess_data)
^
fs/cifs/sess.c:621:1: warning: 'sess_sendreceive' defined but not used [-Wunused-function]
sess_sendreceive(struct sess_data *sess_data)
^

Signed-off-by Thierry Reding <[email protected]>

---
 fs/cifs/sess.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

fs/cifs/sess.c +1 -1

index db6ecdf0974c..5fb7606b81ef 100644
@@ -538,6 +538,7 @@ struct sess_data {
 	struct kvec iov[3];
 };
 
+#ifdef CONFIG_CIFS_WEAK_PW_HASH
 static int
 sess_alloc_buffer(struct sess_data *sess_data, int wct)
 {

@@ -644,7 +645,6 @@ sess_sendreceive(struct sess_data *sess_data)
  * in proc/fs/cifs or via mount parm.  Unfortunately this is
  * needed for old Win (e.g. Win95), some obscure NAS and OS/2
  */
-#ifdef CONFIG_CIFS_WEAK_PW_HASH
 static void
 sess_auth_lanman(struct sess_data *sess_data)
 {

Signature · 1 line

2.0.1

Steve French

2014-07-14 15:29 UTC #1 lore raw

I don't see this build warning, and I do see these functions used outside the CONFIG_CIFS_WEAK_PW_HASH - are you using current linux-next (or equivalently cifs-2.6.git for-next branch)There were some updates to fs/cifs late last week.

Quoted 48 lines · Thierry Reding

From: Thierry Reding <[email protected]>
The sess_alloc_buffer(), sess_free_buffer(), sess_establish_session() and sess_sendreceive() functions are only used by sess_auth_lanman(), therefore should be guarded by the same #ifdef to prevent the following compiler warnings:
fs/cifs/sess.c:542:1: warning: 'sess_alloc_buffer' defined but not used [-Wunused-function]
sess_alloc_buffer(struct sess_data *sess_data, int wct)
^
fs/cifs/sess.c:580:1: warning: 'sess_free_buffer' defined but not used [-Wunused-function]
sess_free_buffer(struct sess_data *sess_data)
^
fs/cifs/sess.c:589:1: warning: 'sess_establish_session' defined but not used [-Wunused-function]
sess_establish_session(struct sess_data *sess_data)
^
fs/cifs/sess.c:621:1: warning: 'sess_sendreceive' defined but not used [-Wunused-function]
sess_sendreceive(struct sess_data *sess_data)
^
Signed-off-by Thierry Reding <[email protected]>
---
 fs/cifs/sess.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/cifs/sess.c +1 -2
index db6ecdf0974c..5fb7606b81ef 100644
@@ -538,6 +538,7 @@ struct sess_data {
        struct kvec iov[3];
 };
 
+#ifdef CONFIG_CIFS_WEAK_PW_HASH
 static int
 sess_alloc_buffer(struct sess_data *sess_data, int wct)
 {
@@ -644,7 +645,6 @@ sess_sendreceive(struct sess_data *sess_data)
  * in proc/fs/cifs or via mount parm.  Unfortunately this is
  * needed for old Win (e.g. Win95), some obscure NAS and OS/2
  */
-#ifdef CONFIG_CIFS_WEAK_PW_HASH
 static void
 sess_auth_lanman(struct sess_data *sess_data)
 {
--
2.0.1

Signature · 3 lines

Thanks,

Steve