My post mentions both federal (about 11,500) and federal + state (about 20,000-40,000). The reason for mentioning federal is because BJS has data for marijuana versus other drug offenses for the federal system.

Note that while only a small proportion of the overall prison population is in federal prison, a much larger proportion of drug convicts are in federal prison.