Diffusion vs osmosis
Diffusion is a transport phenomenon where there is a net movement of molecules from an area in which they are highly concentrated to an area in which they are less concentrated.
Figure 1: Diffusion from an unequal distribution of solutes (left panel) to an equal distribution of solutes (right panel). There is a net movement of solutes from an area of high concentration (right of membrane) to an area of low concentration (left of membrane) until equilibrium is reached.
Osmosis is the net movement of water molecules across a semi-permeable membrane. The water moves from high water potential (a high concentration of water molecules, and therefore a low concentration of dissolved molecules) to low water potential (a high concentration of dissolved molecules).
Figure 2: Osmosis from an unequal distribution of solutes (top) to an equal distribution of solutes (bottom). There is a net movement of water molecules from an area of high water potential (right) to an area of low water potential (left) until equilibrium is reached.