projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
skge: default WOL should be magic only (rev2)
[powerpc.git]
/
fs
/
9p
/
conv.c
diff --git
a/fs/9p/conv.c
b/fs/9p/conv.c
index
1e89814
..
a3ed571
100644
(file)
--- a/
fs/9p/conv.c
+++ b/
fs/9p/conv.c
@@
-27,6
+27,7
@@
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/fs.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"
#include <linux/idr.h>
#include <asm/uaccess.h>
#include "debug.h"
@@
-673,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] */
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))
fc = v9fs_create_common(bufp, size, TCREATE);
if (IS_ERR(fc))