diff --git a/[refs] b/[refs] index 13465dc3bc15..087cc3c7a291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f67909cf80051e8510194a51f88c4de323b92071 +refs/heads/master: cb76d5e25008b76fb8e348c861d32659430ac3fa diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 85a994c6433d..2a43a0aca965 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -846,9 +846,6 @@ cifs_parse_mount_options(char *options, const char *devname, /* default to using server inode numbers where available */ vol->server_ino = 1; - /* XXX: default to fsc for testing until mount.cifs pieces are done */ - vol->fsc = 1; - if (!options) return 1;