According to Osho, meditation (dhyana) is an intentional effort that prepares you to go beyond mind; samadhi is the effortless, natural state that remains when all effort and even alertness drop. Practice until meditation becomes unnecessary—when bliss is no longer produced but simply is, like breathing. Then the path dissolves, and samadhi flowers.
Use meditation until it stops feeling like doing anything; when awareness continues by itself, that’s samadhi.