Change a couple of variable names to avoid sparse warnings about
symbols being shadowed.
Signed-off-by: NRoland Dreier <rolandd@cisco.com>