diff --git a/fs/reiser4/plugin/dir_plugin_common.c b/fs/reiser4/plugin/dir_plugin_common.c index d10fe765d3be2bbdc8977a35a307a6bb5569246c..4eb6165348894814a9b50ec02bda178230a27b57 100644 --- a/fs/reiser4/plugin/dir_plugin_common.c +++ b/fs/reiser4/plugin/dir_plugin_common.c @@ -56,10 +56,7 @@ struct dentry *get_parent_common(struct inode *child) check_light_weight(parent, child); reiser4_iget_complete(parent); dentry = d_obtain_alias(parent); - if (dentry == NULL) { - iput(parent); - dentry = ERR_PTR(RETERR(-ENOMEM)); - } else + if (!IS_ERR(dentry)) dentry->d_op = &get_super_private(s)->ops.dentry; } else if (PTR_ERR(parent) == -ENOENT) dentry = ERR_PTR(RETERR(-ESTALE)); @@ -353,11 +350,6 @@ int reiser4_dir_done_common(struct inode *object/* object being deleted */) result = reiser4_rem_entry_common(object, &goodby_dots, &entry); reiser4_free_dentry_fsdata(&goodby_dots); if (unlikely(result != 0 && result != -ENOMEM && result != -ENOENT)) - /* only worth a warning - - "values of B will give rise to dom!\n" - -- v6src/s2/mv.c:89 - */ warning("nikita-2252", "Cannot remove dot of %lli: %i", (unsigned long long)get_inode_oid(object), result); return 0; diff --git a/fs/reiser4/plugin/file_plugin_common.c b/fs/reiser4/plugin/file_plugin_common.c index 3b42ac9f733d95eb2f732329d730cc155bac94d4..7e6b0b1a9dd8022e8640a3f87a319c11f5728163 100644 --- a/fs/reiser4/plugin/file_plugin_common.c +++ b/fs/reiser4/plugin/file_plugin_common.c @@ -476,10 +476,7 @@ struct dentry *wire_get_common(struct super_block *sb, if (!IS_ERR(inode)) { reiser4_iget_complete(inode); dentry = d_obtain_alias(inode); - if (dentry == NULL) { - iput(inode); - dentry = ERR_PTR(-ENOMEM); - } else + if (!IS_ERR(dentry)) dentry->d_op = &get_super_private(sb)->ops.dentry; } else if (PTR_ERR(inode) == -ENOENT) /*