Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / fs / 9p / conv.c

diff --git a/fs/9p/conv.c b/fs/9p/conv.c
index 56d88c1..a767e05 100644 (file)
--- a/fs/9p/conv.c
+++ b/fs/9p/conv.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
@@ -673,10 +674,8 @@ struct v9fs_fcall *v9fs_create_tcreate(u32 fid, char *name, u32 perm, u8 mode,
        struct cbuf *bufp = &buffer;
 
        size = 4 + 2 + strlen(name) + 4 + 1;    /* fid[4] name[s] perm[4] mode[1] */
-       if (extended) {
-               size += 2 +                     /* extension[s] */
-                   (extension == NULL ? 0 : strlen(extension));
-       }
+       if (extended && extension!=NULL)
+               size += 2 + strlen(extension);  /* extension[s] */
 
        fc = v9fs_create_common(bufp, size, TCREATE);
        if (IS_ERR(fc))