This is a pure cleanup patch.
Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>