While here, update the code a bit.
Signed-off-by: NAlexandros Batsakis <batsakis@netapp.com>
Signed-off-by: NFred Isaman <iisaman@netapp.com>
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>