This patch was very confusing to review... >From a process perspective, you really should fold patches 1 and 2 together. Otherwise we're re-introducing a bug. regards, dan carpenter