Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[firefly-linux-kernel-4.4.55.git] / fs / affs / namei.c

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index d4c2d636c479dc2aaaa986656a8659424aac56a6..a42143ca01698e1ba64769d5d9eb1bc0aa095320 100644 (file)
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -416,10 +416,9 @@ affs_rename(struct inode *old_dir, struct dentry *old_dentry,
                        return retval;
        }
 
-       retval = -EIO;
        bh = affs_bread(sb, old_dentry->d_inode->i_ino);
        if (!bh)
-               goto done;
+               return -EIO;
 
        /* Remove header from its parent directory. */
        affs_lock_dir(old_dir);