Eliminate duplicate code, unneeded variables, etc., to make it easier
to understand the code.  No behavioral changes were made in this patch.
Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>