There is no logical change in this patch, just a preparatory patch,
so that changes can be easily reasoned.
Signed-off-by: NAnand Jain <anand.jain@oracle.com>
Signed-off-by: NChris Mason <clm@fb.com>