Version 2 of the patch. Thanks to Dan Carpenter and the smatch
tool for finding a problem in the first version of this patch.

CC: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: NPavel Shilovsky <pshilovsky@samba.org>
Signed-off-by: NSteve French <steve.french@primarydata.com>