block: revert the previous backport of mainline Linux

Conflicts:
	block/elevator.c
	drivers/staging/zram/zram_drv.c