Reconciliation of src/{afs,vol}/voldefs.h