--- c34680849c5290199a91d42bf276dc6f9d20e01e +++ a53b9e5068cdccc0a5850cbd7284e7d8d1fbc52b @@ -616,13 +616,6 @@ static void nfs_show_mount_options(struc if (nfss->options & NFS_OPTION_FSCACHE) seq_printf(m, ",fsc"); - - if (nfss->flags & NFS_MOUNT_LOOKUP_CACHE_NONEG) { - if (nfss->flags & NFS_MOUNT_LOOKUP_CACHE_NONE) - seq_printf(m, ",lookupcache=none"); - else - seq_printf(m, ",lookupcache=pos"); - } } /* @@ -1925,15 +1918,6 @@ nfs_remount(struct super_block *sb, int if (error < 0) goto out; - /* - * noac is a special case. It implies -o sync, but that's not - * necessarily reflected in the mtab options. do_remount_sb - * will clear MS_SYNCHRONOUS if -o sync wasn't specified in the - * remount options, so we have to explicitly reset it. - */ - if (data->flags & NFS_MOUNT_NOAC) - *flags |= MS_SYNCHRONOUS; - /* compare new mount options with old ones */ error = nfs_compare_remount_data(nfss, data); out: