Looks fine but can you redo this on top of the module unload race fix once we agree on that? I expect the race fix to go into 2.6.17 and this API change to go into 2.6.18, so the API change needs to apply on top of the race fix. - R.