Sumant Patro confirmed that that one-liner is a critical fix that "must be applied." Unfortunately, it doesn't fix my problem :-(. I've gone back to the BLKDEV_MAX_RQ workaround for now; if I learn of a better solution, I'll send it along.