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
SubjectRe: smb_ops_unix warning (was: Re: Linux 2.4.25-rc2)
On Thu, 12 Feb 2004, Geert Uytterhoeven wrote:

> 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.

Ah, thanks.


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

Code below builds cleanly for me either way, but I have not tested it yet.
Will do that later.

The config could also be removed, but I like that 2.4 users can keep the
previous 2.4 behaviour if they want to.

/Urban


diff -ur linux-2.4.25-rc2-orig/fs/smbfs/proc.c linux-2.4.25-rc2-smbfs/fs/smbfs/proc.c
--- linux-2.4.25-rc2-orig/fs/smbfs/proc.c 2004-02-12 17:52:37.000000000 +0100
+++ linux-2.4.25-rc2-smbfs/fs/smbfs/proc.c 2004-02-12 17:54:41.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>
@@ -915,7 +916,9 @@
SB_of(server)->s_maxbytes = ~0ULL >> 1;
VERBOSE("LFS enabled\n");
}
-#ifdef CONFIG_SMB_UNIX
+#ifndef CONFIG_SMB_UNIX
+ server->opt.capabilities &= ~SMB_CAP_UNIX;
+#endif
if (server->opt.capabilities & SMB_CAP_UNIX) {
struct inode *inode;
VERBOSE("Using UNIX CIFS extensions\n");
@@ -924,9 +927,6 @@
if (inode)
inode->i_op = &smb_dir_inode_operations_unix;
}
-#else
- server->opt.capabilities &= ~SMB_CAP_UNIX;
-#endif

VERBOSE("protocol=%d, max_xmit=%d, pid=%d capabilities=0x%x\n",
server->opt.protocol, server->opt.max_xmit, server->conn_pid,
-
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.061 / U:1.284 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site