Cleanup to fs/sysfs/dir.c from 3.12.rc1