From: Jean Delvare <khali@linux-fr.org>
To: Steve French <sfrench@us.ibm.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] Fix cifs breakage when CONFIG_CIFS_EXPERIMENTAL=n
Date: Mon, 24 Apr 2006 22:25:39 +0200 [thread overview]
Message-ID: <20060424222539.1d3c96fd.khali@linux-fr.org> (raw)
Hi Steve,
Cifs is currently broken when CONFIG_CIFS_EXPERIMENTAL=n:
fs/cifs/connect.c: In function `cifs_setup_session':
fs/cifs/connect.c:3451: warning: implicit declaration of function `CIFS_SessSetup'
(...)
WARNING: "CIFS_SessSetup" [fs/cifs/cifs.ko] undefined!
The following patch attempts to fix that. Untested beyond compilation.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
fs/cifs/cifsproto.h | 2 --
fs/cifs/cifssmb.c | 2 --
fs/cifs/ntlmssp.c | 2 --
3 files changed, 6 deletions(-)
--- linux-2.6.17-rc2.orig/fs/cifs/cifsproto.h 2006-04-24 21:56:45.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/cifsproto.h 2006-04-24 22:05:43.000000000 +0200
@@ -64,14 +64,12 @@
extern void header_assemble(struct smb_hdr *, char /* command */ ,
const struct cifsTconInfo *, int /* length of
fixed section (word count) in two byte units */);
-#ifdef CONFIG_CIFS_EXPERIMENTAL
extern int small_smb_init_no_tc(const int smb_cmd, const int wct,
struct cifsSesInfo *ses,
void ** request_buf);
extern int CIFS_SessSetup(unsigned int xid, struct cifsSesInfo *ses,
const int stage, int * pNTLMv2_flg,
const struct nls_table *nls_cp);
-#endif
extern __u16 GetNextMid(struct TCP_Server_Info *server);
extern struct oplock_q_entry * AllocOplockQEntry(struct inode *, u16,
struct cifsTconInfo *);
--- linux-2.6.17-rc2.orig/fs/cifs/ntlmssp.c 2006-04-24 21:56:45.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/ntlmssp.c 2006-04-24 22:09:34.000000000 +0200
@@ -27,7 +27,6 @@
#include "ntlmssp.h"
#include "nterr.h"
-#ifdef CONFIG_CIFS_EXPERIMENTAL
static __u32 cifs_ssetup_hdr(struct cifsSesInfo *ses, SESSION_SETUP_ANDX *pSMB)
{
__u32 capabilities = 0;
@@ -140,4 +139,3 @@
return rc;
}
-#endif /* CONFIG_CIFS_EXPERIMENTAL */
--- linux-2.6.17-rc2.orig/fs/cifs/cifssmb.c 2006-04-24 10:47:55.000000000 +0200
+++ linux-2.6.17-rc2/fs/cifs/cifssmb.c 2006-04-24 22:08:19.000000000 +0200
@@ -188,7 +188,6 @@
return rc;
}
-#ifdef CONFIG_CIFS_EXPERIMENTAL
int
small_smb_init_no_tc(const int smb_command, const int wct,
struct cifsSesInfo *ses, void **request_buf)
@@ -214,7 +213,6 @@
return rc;
}
-#endif /* CONFIG_CIFS_EXPERIMENTAL */
/* If the return code is zero, this function must fill in request_buf pointer */
static int
--
Jean Delvare
next reply other threads:[~2006-04-24 20:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-24 20:25 Jean Delvare [this message]
2006-04-24 20:52 ` Dave Jones
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060424222539.1d3c96fd.khali@linux-fr.org \
--to=khali@linux-fr.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfrench@us.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome