Merge ../linux-2.6

1 files changed, 4 insertions, 2 deletions

diff --git a/fs/9p/conv.c b/fs/9p/conv.c
index 1e898144eb7c..56d88c1a09c5 100644
--- a/fs/9p/conv.c
+++ b/fs/9p/conv.c
@@ -673,8 +673,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))