lkml.org 
[lkml]   [2004]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectsmb_ops_unix warning (was: Re: Linux 2.4.25-rc2)
On Wed, 11 Feb 2004, Marcelo Tosatti wrote:
> Here goes -rc2, with small number of fixes and corrections.

This patch adds a missing include (fortunately it was included in some other
include, but its' not clean for files that check CONFIG_* flags) and kills a
compiler warning (introduced in -rc1, IIRC) if CONFIG_SMB_UNIX is not set.

Alternatively, perhaps the code can be reshuffled a bit to avoid too many
ifdefs?

--- linux-2.4.25-rc2/fs/smbfs/proc.c 2004-01-30 09:17:07.000000000 +0100
+++ linux-m68k-2.4.25-rc2/fs/smbfs/proc.c 2004-02-12 13:46:14.000000000 +0100
@@ -7,6 +7,7 @@
* Please add a note about your changes to smbfs in the ChangeLog file.
*/

+#include <linux/config.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/slab.h>
@@ -49,7 +50,9 @@
static struct smb_ops smb_ops_os2;
static struct smb_ops smb_ops_win95;
static struct smb_ops smb_ops_winNT;
+#ifdef CONFIG_SMB_UNIX
static struct smb_ops smb_ops_unix;
+#endif

static void
smb_init_dirent(struct smb_sb_info *server, struct smb_fattr *fattr);
@@ -2636,6 +2639,7 @@
return result;
}

+#ifdef CONFIG_SMB_UNIX
/*
* Note: called with the server locked.
*/
@@ -2680,6 +2684,7 @@
out:
return result;
}
+#endif /* CONFIG_SMB_UNIX */

static int
smb_proc_getattr_null(struct smb_sb_info *server, struct dentry *dir,
@@ -3332,6 +3337,7 @@
.truncate = smb_proc_trunc64,
};

+#ifdef CONFIG_SMB_UNIX
/* Samba w/ unix extensions. Others? */
static struct smb_ops smb_ops_unix =
{
@@ -3341,6 +3347,7 @@
.getattr = smb_proc_getattr_unix,
.truncate = smb_proc_trunc64,
};
+#endif /* CONFIG_SMB_UNIX */

/* Place holder until real ops are in place */
static struct smb_ops smb_ops_null =
Gr{oetje,eeting}s,
Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:00    [W:0.059 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site