London - Shanghai - Cruise to S Korea/Japan

I am flying into Shanghai from London, staying 2 nights in Shanghai, then taking a cruise from Shanghai to S. Korea, terminating in Tokyo. I take it that qualifies for this visa-exemption. My cruise company (Celebrity) seems unaware of this set-up and asked me to apply for a Chinese entry permit.