diff --git a/[refs] b/[refs] index 75ca623e8187..b56f58a4d7f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07724f98978ad39386a3996a4e1b6780489a4dda +refs/heads/master: caecd0af8fe0635e8e6900399b951433af35bf52 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index bae4124e1473..b875ff555865 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -1673,7 +1673,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); if (handle_mount_opt(sb, p, token, args, journal_devnum, journal_ioprio, is_remount) < 0)