diff --git a/[refs] b/[refs] index 931a7e6aba93..e3b7f70cce67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 378b8e1ad18e7c97832aa3771e295153c4cd2a55 +refs/heads/master: 76f59b3bf5af41c2fb60f05f5d5ec51e8138e996 diff --git a/trunk/fs/ext3/super.c b/trunk/fs/ext3/super.c index d90ad0574705..504fb3f51420 100644 --- a/trunk/fs/ext3/super.c +++ b/trunk/fs/ext3/super.c @@ -975,7 +975,7 @@ static int parse_options (char *options, struct super_block *sb, * Initialize args struct so we know whether arg was * found; some options take optional arguments. */ - args[0].to = args[0].from = 0; + args[0].to = args[0].from = NULL; token = match_token(p, tokens, args); switch (token) { case Opt_bsd_df: