nfs: fix handling of invalid mount options in nfs_remount
authorJeff Layton <jlayton@redhat.com>
Mon, 21 Oct 2013 13:52:19 +0000 (09:52 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Mon, 28 Oct 2013 18:35:07 +0000 (14:35 -0400)
nfs_parse_mount_options returns 0 on error, not -errno.

Reported-by: Karel Zak <kzak@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/super.c

index 137572bb7037564095ea33191d2bf8cb4c346db5..3f5a7a85c9c2604d5ca9a7f720e7db551731c1ee 100644 (file)
@@ -2205,8 +2205,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
                data->nfs_server.addrlen);
 
        /* overwrite those values with any that were specified */
-       error = nfs_parse_mount_options((char *)options, data);
-       if (error < 0)
+       error = -EINVAL;
+       if (!nfs_parse_mount_options((char *)options, data))
                goto out;
 
        /*