X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=fs%2F9p%2Fconv.c;h=a3ed571eee31b3754224aad4118c517abfe1def1;hb=5f0b1437e0708772b6fecae5900c01c3b5f9b512;hp=a767e05b60bf3d03eb9438344246be3bdc71bbfc;hpb=7d14f145f839b5d0d221ea209b4998f93267e2ec;p=mv-sheeva.git

diff --git a/fs/9p/conv.c b/fs/9p/conv.c
index a767e05b60b..a3ed571eee3 100644
--- a/fs/9p/conv.c
+++ b/fs/9p/conv.c
@@ -24,10 +24,10 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
+#include <linux/sched.h>
 #include <linux/idr.h>
 #include <asm/uaccess.h>
 #include "debug.h"
@@ -674,8 +674,10 @@ 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 && extension!=NULL)
-		size += 2 + strlen(extension);	/* extension[s] */
+	if (extended) {
+		size += 2 +			/* extension[s] */
+		    (extension == NULL ? 0 : strlen(extension));
+	}
 
 	fc = v9fs_create_common(bufp, size, TCREATE);
 	if (IS_ERR(fc))