Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-block.git] / fs / udf / namei.c

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index fac806a7a8d43c2dab34fc335bc780b4f468a357..1bb6ed948927fbe5a2d4176671b00d96fa63ddc3 100644 (file)
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -125,8 +125,6 @@ static struct dentry *udf_lookup(struct inode *dir, struct dentry *dentry,
                udf_fiiter_release(&iter);
 
                inode = udf_iget(dir->i_sb, &loc);
-               if (IS_ERR(inode))
-                       return ERR_CAST(inode);
        }
 
        return d_splice_alias(inode, dentry);
@@ -230,8 +228,6 @@ static int udf_fiiter_add_entry(struct inode *dir, struct dentry *dentry,
        char name[UDF_NAME_LEN_CS0];
 
        if (dentry) {
-               if (!dentry->d_name.len)
-                       return -EINVAL;
                namelen = udf_put_filename(dir->i_sb, dentry->d_name.name,
                                           dentry->d_name.len,
                                           name, UDF_NAME_LEN_CS0);
@@ -904,7 +900,6 @@ out_oiter:
 static struct dentry *udf_get_parent(struct dentry *child)
 {
        struct kernel_lb_addr tloc;
-       struct inode *inode = NULL;
        struct udf_fileident_iter iter;
        int err;
 
@@ -914,11 +909,7 @@ static struct dentry *udf_get_parent(struct dentry *child)
 
        tloc = lelb_to_cpu(iter.fi.icb.extLocation);
        udf_fiiter_release(&iter);
-       inode = udf_iget(child->d_sb, &tloc);
-       if (IS_ERR(inode))
-               return ERR_CAST(inode);
-
-       return d_obtain_alias(inode);
+       return d_obtain_alias(udf_iget(child->d_sb, &tloc));
 }