Signed-off-by: Alan Cox <alan@redhat.com>

from a 2.4 change by Clear Zhang (signed off by Clear Zhang)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>