Commit 5da3d2ca authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/misc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 840fb5f2 d10fe26e
...@@ -61,7 +61,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid ...@@ -61,7 +61,7 @@ static int parse_options(char *options, int *pipefd, uid_t *uid, gid_t *gid, pid
if ( !options ) return 1; if ( !options ) return 1;
while ((this_char = strsep(&options,",")) != NULL) { while ((this_char = strsep(&options,",")) != NULL) {
if (!*value) if (!*this_char)
continue; continue;
if ((value = strchr(this_char,'=')) != NULL) if ((value = strchr(this_char,'=')) != NULL)
*value++ = 0; *value++ = 0;
......
...@@ -34,7 +34,7 @@ struct export_operations export_op_default; ...@@ -34,7 +34,7 @@ struct export_operations export_op_default;
#define CALL(ops,fun) ((ops->fun)?(ops->fun):export_op_default.fun) #define CALL(ops,fun) ((ops->fun)?(ops->fun):export_op_default.fun)
#define dprintk(x, ...) do{}while(0) #define dprintk(x, a...) do{}while(0)
struct dentry * struct dentry *
find_exported_dentry(struct super_block *sb, void *obj, void *parent, find_exported_dentry(struct super_block *sb, void *obj, void *parent,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment