long and parent_inode additions
merged