Definition of osmosis
A) The best explanation of osmosis is 'The movement of water from a dilute solution to a concentrated solution across a partially permeable membrane'.
B) An acceptable description of diffusion (at least in solutions) is 'The movement of a substance from a concentrated solution to a dilute solution'. (The partially permeable membrane is not necessary for diffusion to happen.)