hypfs: ->d_parent is never NULL or negative

[deliverable/linux.git] / arch / s390 / hypfs / inode.c

diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 73dae8b9b77a8c9f58c3c9e1f81f206b74dac04c..a0d92d119f4bf24717e4a5b8007b4836b64cbf1a 100644 (file)
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -1,5 +1,4 @@
 /*
- *  arch/s390/hypfs/inode.c
  *    Hypervisor filesystem for Linux on s390.
  *
  *    Copyright IBM Corp. 2006, 2008
@@ -73,8 +72,6 @@ static void hypfs_remove(struct dentry *dentry)
        struct dentry *parent;
 
        parent = dentry->d_parent;
-       if (!parent || !parent->d_inode)
-               return;
        mutex_lock(&parent->d_inode->i_mutex);
        if (hypfs_positive(dentry)) {
                if (S_ISDIR(dentry->d_inode->i_mode))
@@ -103,6 +100,7 @@ static struct inode *hypfs_make_inode(struct super_block *sb, umode_t mode)
 
        if (ret) {
                struct hypfs_sb_info *hypfs_info = sb->s_fs_info;
+               ret->i_ino = get_next_ino();
                ret->i_mode = mode;
                ret->i_uid = hypfs_info->uid;
                ret->i_gid = hypfs_info->gid;